From 562e4394473caca28604bc9ab208578679e42385 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 11 Sep 2026 12:48:44 +0200
Subject: [PATCH 01/20] Show a loading indicator on the placeholders which can
 stay on screen forever
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

emptyNode() renders nothing at all, which is fine for a placeholder that is left
within a few frames, but makes the application look frozen when the wait can
last, or never end.

Add a delayBeforeShowingContent parameter to emptyNode(): when it is finite, a
progress indicator and a "Loading…" label fade in after that delay, reusing the
existing DelayedVisibility helper. It defaults to Duration.INFINITE, so the
splash screen keeps rendering an empty canvas.

Use a one second delay on the two placeholders which are not guaranteed to be
left: the FTUE one, rendered while waiting for the session verified status, and
the LoggedInFlowNode one, rendered while the FTUE state is unknown.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 .../android/appnav/LoggedInFlowNode.kt        |  5 +-
 .../features/ftue/impl/FtueFlowNode.kt        |  6 ++-
 libraries/ui-common/build.gradle.kts          |  1 +
 .../libraries/ui/common/nodes/EmptyNode.kt    | 53 +++++++++++++++++--
 4 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
index dab9b7828c..4254d66664 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -113,6 +113,7 @@ import java.time.Duration
 import java.time.Instant
 import java.util.Optional
 import java.util.UUID
+import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.toKotlinDuration
@@ -324,7 +325,9 @@ class LoggedInFlowNode(
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
-            NavTarget.Placeholder -> emptyNode(buildContext)
+            // Rendered while the FtueState is Unknown. Render a loading state rather than nothing at all,
+            // since there is no guarantee that this state will be left.
+            NavTarget.Placeholder -> emptyNode(buildContext, delayBeforeShowingContent = 500.milliseconds)
             NavTarget.LoggedInPermanent -> {
                 val callback = object : LoggedInNode.Callback {
                     override fun navigateToNotificationTroubleshoot() {
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt
index 8d66258e12..b3d96a88e5 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt
@@ -37,6 +37,7 @@ import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.parcelize.Parcelize
+import kotlin.time.Duration.Companion.milliseconds
 
 @ContributesNode(SessionScope::class)
 @AssistedInject
@@ -84,7 +85,10 @@ class FtueFlowNode(
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
             NavTarget.Placeholder -> {
-                emptyNode(buildContext)
+                // Rendered while waiting for the initial state (see FtueStep.WaitingForInitialState).
+                // This can last for a while, or forever if the sync service never manages to run, so
+                // render a loading state rather than nothing at all.
+                emptyNode(buildContext, delayBeforeShowingContent = 500.milliseconds)
             }
             is NavTarget.SessionVerification -> {
                 val callback = object : FtueSessionVerificationFlowNode.Callback {
diff --git a/libraries/ui-common/build.gradle.kts b/libraries/ui-common/build.gradle.kts
index 76c772f9fc..440892e90d 100644
--- a/libraries/ui-common/build.gradle.kts
+++ b/libraries/ui-common/build.gradle.kts
@@ -17,4 +17,5 @@ android {
 dependencies {
     implementation(libs.appyx.core)
     implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.uiStrings)
 }
diff --git a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyNode.kt b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyNode.kt
index 53cc8c8443..7d9e851e89 100644
--- a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyNode.kt
+++ b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyNode.kt
@@ -9,37 +9,84 @@
 package io.element.android.libraries.ui.common.nodes
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.node.node
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.utils.DelayedVisibility
+import io.element.android.libraries.ui.strings.CommonStrings
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
 
 /**
  * Ref: https://www.figma.com/design/0MMNu7cTOzLOlWb7ctTkv3/Element-X?node-id=1518-85323
+ *
+ * @param buildContext the [BuildContext] of the Node.
+ * @param delayBeforeShowingContent when finite, a loading indicator fades in after this delay. Use it for
+ * placeholders which can stay on screen for a long time, or forever, else the application looks frozen.
+ * Defaults to [Duration.INFINITE], i.e. the Node stays empty.
  */
 fun emptyNode(
     buildContext: BuildContext,
+    delayBeforeShowingContent: Duration = Duration.INFINITE,
 ): Node = node(buildContext) { modifier ->
-    EmptyView(modifier)
+    EmptyView(
+        delayBeforeShowingContent = delayBeforeShowingContent,
+        modifier = modifier,
+    )
 }
 
 @Composable
 private fun EmptyView(
+    delayBeforeShowingContent: Duration,
     modifier: Modifier = Modifier,
 ) = Box(
     modifier = modifier
         .fillMaxSize()
         .background(ElementTheme.colors.bgCanvasDefault),
-)
+    contentAlignment = Alignment.Center,
+) {
+    if (delayBeforeShowingContent.isFinite()) {
+        DelayedVisibility(duration = delayBeforeShowingContent) {
+            LoadingContent()
+        }
+    }
+}
+
+@Composable
+private fun LoadingContent() = Column(
+    horizontalAlignment = Alignment.CenterHorizontally,
+    verticalArrangement = Arrangement.spacedBy(16.dp),
+) {
+    CircularProgressIndicator()
+    Text(
+        text = stringResource(CommonStrings.common_loading),
+        color = ElementTheme.colors.textSecondary,
+        style = ElementTheme.typography.fontBodyMdRegular,
+    )
+}
 
 @PreviewsDayNight
 @Composable
 internal fun EmptyViewPreview() = ElementPreview {
-    EmptyView(Modifier)
+    EmptyView(delayBeforeShowingContent = Duration.INFINITE)
+}
+
+@PreviewsDayNight
+@Composable
+internal fun EmptyViewLoadingPreview() = ElementPreview {
+    EmptyView(delayBeforeShowingContent = 1.seconds)
 }

From d59120aad0bd9fa32a31f75d2a50f3c3776868ea Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 11 Sep 2026 12:48:58 +0200
Subject: [PATCH 02/20] Restart the sync service when it stops on an error

Synapse deletes sliding sync connections that have been unused for 7 days. When
an OEM battery manager has kept the application frozen for longer than that, the
next sliding sync request is answered 400 M_UNKNOWN_POS.

The Rust SDK handles that: it resets `pos` and, in offline mode, restarts the
sync. When that recovery gives up, the sync service ends up in the Error or
Terminated state and stops for good, and it is then up to the application to
call start() again. Element X iOS does it, we do not: SyncOrchestrator only
restarts the sync service when its state is Idle, so the sync stays dead for the
rest of the process lifetime.

Nothing recovers from there. The sync never reaches Running, so
waitForE2eeInitializationTasks() never returns, the session verified status
stays Unknown, and the FTUE is stuck on WaitingForInitialState. Clearing the
application data is the only workaround.

Restart the sync service when it is in the Error or Terminated state, with an
exponential backoff from 1s to 30s to avoid hammering a failing homeserver. The
backoff is only reset once the sync service has been running for a while, since
startSync() moves the state to Running right away.

Fixes #7689

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 .../appnav/session/SyncOrchestrator.kt        |  68 +++++++-
 .../android/appnav/SyncOrchestratorTest.kt    | 147 ++++++++++++++++++
 2 files changed, 213 insertions(+), 2 deletions(-)

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/session/SyncOrchestrator.kt b/appnav/src/main/kotlin/io/element/android/appnav/session/SyncOrchestrator.kt
index 3a72c10ab7..786365b7be 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/session/SyncOrchestrator.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/session/SyncOrchestrator.kt
@@ -28,10 +28,14 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicInteger
+import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
@@ -60,6 +64,12 @@ class SyncOrchestrator(
 
     private val started = AtomicBoolean(false)
 
+    /**
+     * Number of consecutive attempts at restarting a sync service which stopped on its own.
+     * Reset once the sync service has been running for [RESTART_BACKOFF_RESET_DELAY].
+     */
+    private val restartAttempt = AtomicInteger(0)
+
     /**
      * Starting observing the app state and network state to start/stop the sync service.
      *
@@ -91,6 +101,17 @@ class SyncOrchestrator(
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     internal fun observeStates() = coroutineScope.launch {
         Timber.tag(tag).d("start observing the app and network state")
+        // Reset the restart backoff once the sync service has been steadily running for a while. Note that
+        // SyncService.startSync() moves the state to Running right away, so resetting on any Running value
+        // would defeat the backoff when the sync service dies again immediately after each restart.
+        syncService.syncState
+            .debounce(RESTART_BACKOFF_RESET_DELAY)
+            .onEach { syncState ->
+                if (syncState == SyncState.Running) {
+                    restartAttempt.set(0)
+                }
+            }
+            .launchIn(this)
         val isAppActiveFlows = listOf(
             appForegroundStateService.isInForeground,
             appForegroundStateService.isInCall,
@@ -117,14 +138,26 @@ class SyncOrchestrator(
                 SyncStateAction.StopSync
             } else if (syncState == SyncState.Idle && isAppActive && isNetworkAvailable) {
                 SyncStateAction.StartSync
+            } else if (syncState.isDead() && isAppActive && isNetworkAvailable) {
+                // The sync service has given up, for instance because the homeserver has expired our sliding sync
+                // session and answered 400 M_UNKNOWN_POS. Nothing else will ever restart it, so do it from here,
+                // else the application is stuck until its data is cleared.
+                SyncStateAction.RestartSync
             } else {
                 SyncStateAction.NoOp
             }
         }
             .distinctUntilChanged()
             .debounce { action ->
-                // Don't stop the sync immediately, wait a bit to avoid starting/stopping the sync too often
-                if (action == SyncStateAction.StopSync) 3.seconds else 0.seconds
+                when (action) {
+                    // Don't stop the sync immediately, wait a bit to avoid starting/stopping the sync too often
+                    SyncStateAction.StopSync -> 3.seconds
+                    // Back off before restarting a dead sync service, to avoid hammering a failing homeserver.
+                    // A state change in the meantime cancels the pending restart.
+                    SyncStateAction.RestartSync -> restartDelay(restartAttempt.get())
+                    SyncStateAction.StartSync,
+                    SyncStateAction.NoOp -> 0.seconds
+                }
             }
             .onCompletion {
                 Timber.tag(tag).d("has been stopped")
@@ -134,6 +167,11 @@ class SyncOrchestrator(
                     SyncStateAction.StartSync -> {
                         syncService.startSync()
                     }
+                    SyncStateAction.RestartSync -> {
+                        val attempt = restartAttempt.incrementAndGet()
+                        Timber.tag(tag).w("sync service is dead, restarting it (attempt $attempt)")
+                        syncService.startSync()
+                    }
                     SyncStateAction.StopSync -> {
                         syncService.stopSync()
                     }
@@ -143,8 +181,34 @@ class SyncOrchestrator(
     }
 }
 
+@VisibleForTesting
+internal val FIRST_RESTART_DELAY = 1.seconds
+
+@VisibleForTesting
+internal val MAX_RESTART_DELAY = 30.seconds
+
+/**
+ * Duration during which the sync service has to stay running before the restart backoff is reset.
+ */
+@VisibleForTesting
+internal val RESTART_BACKOFF_RESET_DELAY = 30.seconds
+
+/**
+ * Return true if the sync service has stopped and will not restart by itself.
+ */
+private fun SyncState.isDead() = this == SyncState.Error || this == SyncState.Terminated
+
+/**
+ * Exponential backoff, from [FIRST_RESTART_DELAY], doubling on every attempt, up to [MAX_RESTART_DELAY].
+ */
+private fun restartDelay(attempt: Int): Duration {
+    val exponent = attempt.coerceIn(0, 5)
+    return (FIRST_RESTART_DELAY * (1 shl exponent)).coerceAtMost(MAX_RESTART_DELAY)
+}
+
 private enum class SyncStateAction {
     StartSync,
+    RestartSync,
     StopSync,
     NoOp,
 }
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/SyncOrchestratorTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/SyncOrchestratorTest.kt
index 32d0ec8f56..9475399a85 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/SyncOrchestratorTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/SyncOrchestratorTest.kt
@@ -8,6 +8,9 @@
 
 package io.element.android.appnav
 
+import io.element.android.appnav.session.FIRST_RESTART_DELAY
+import io.element.android.appnav.session.MAX_RESTART_DELAY
+import io.element.android.appnav.session.RESTART_BACKOFF_RESET_DELAY
 import io.element.android.appnav.session.SyncOrchestrator
 import io.element.android.features.networkmonitor.api.NetworkStatus
 import io.element.android.features.networkmonitor.test.FakeNetworkMonitor
@@ -414,6 +417,150 @@ class SyncOrchestratorTest {
         startSyncRecorder.assertions().isNeverCalled()
     }
 
+    @Test
+    fun `when the sync service is in error, it will be restarted after a delay`() = runTest {
+        val startSyncRecorder = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val syncService = FakeSyncService(initialSyncState = SyncState.Error).apply {
+            startSyncLambda = startSyncRecorder
+        }
+        val syncOrchestrator = createSyncOrchestrator(
+            matrixClient = FakeMatrixClient(syncService = syncService),
+            networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Connected),
+            appForegroundStateService = FakeAppForegroundStateService(initialForegroundValue = true),
+        )
+
+        // We start observing
+        syncOrchestrator.observeStates()
+
+        // The restart does not happen right away, we back off first
+        advanceTimeBy(FIRST_RESTART_DELAY / 2)
+        startSyncRecorder.assertions().isNeverCalled()
+
+        // But it does happen once the backoff has elapsed
+        advanceTimeBy(FIRST_RESTART_DELAY)
+        startSyncRecorder.assertions().isCalledOnce()
+    }
+
+    @Test
+    fun `when the sync service is terminated, it will be restarted after a delay`() = runTest {
+        val startSyncRecorder = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val syncService = FakeSyncService(initialSyncState = SyncState.Terminated).apply {
+            startSyncLambda = startSyncRecorder
+        }
+        val syncOrchestrator = createSyncOrchestrator(
+            matrixClient = FakeMatrixClient(syncService = syncService),
+            networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Connected),
+            appForegroundStateService = FakeAppForegroundStateService(initialForegroundValue = true),
+        )
+
+        // We start observing
+        syncOrchestrator.observeStates()
+
+        advanceTimeBy(FIRST_RESTART_DELAY * 2)
+        startSyncRecorder.assertions().isCalledOnce()
+    }
+
+    @Test
+    fun `when the sync service keeps dying, the delay between the restarts increases`() = runTest {
+        val startSyncRecorder = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val syncService = FakeSyncService(initialSyncState = SyncState.Error).apply {
+            startSyncLambda = startSyncRecorder
+        }
+        val syncOrchestrator = createSyncOrchestrator(
+            matrixClient = FakeMatrixClient(syncService = syncService),
+            networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Connected),
+            appForegroundStateService = FakeAppForegroundStateService(initialForegroundValue = true),
+        )
+
+        // We start observing
+        syncOrchestrator.observeStates()
+
+        advanceTimeBy(FIRST_RESTART_DELAY * 2)
+        startSyncRecorder.assertions().isCalledOnce()
+
+        // The sync service starts, but dies again straight away
+        syncService.emitSyncState(SyncState.Running)
+        advanceTimeBy(200.milliseconds)
+        syncService.emitSyncState(SyncState.Error)
+
+        // The second restart is not attempted after the first delay anymore
+        advanceTimeBy(FIRST_RESTART_DELAY + 200.milliseconds)
+        startSyncRecorder.assertions().isCalledOnce()
+
+        // But after twice that delay
+        advanceTimeBy(FIRST_RESTART_DELAY)
+        startSyncRecorder.assertions().isCalledExactly(2)
+    }
+
+    @Test
+    fun `when the sync service recovers, the delay between the restarts is reset`() = runTest {
+        val startSyncRecorder = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val syncService = FakeSyncService(initialSyncState = SyncState.Error).apply {
+            startSyncLambda = startSyncRecorder
+        }
+        val syncOrchestrator = createSyncOrchestrator(
+            matrixClient = FakeMatrixClient(syncService = syncService),
+            networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Connected),
+            appForegroundStateService = FakeAppForegroundStateService(initialForegroundValue = true),
+        )
+
+        // We start observing
+        syncOrchestrator.observeStates()
+
+        advanceTimeBy(FIRST_RESTART_DELAY * 2)
+        startSyncRecorder.assertions().isCalledOnce()
+
+        // The sync service is now running, and keeps running for a while
+        syncService.emitSyncState(SyncState.Running)
+        advanceTimeBy(RESTART_BACKOFF_RESET_DELAY + 1.seconds)
+        startSyncRecorder.assertions().isCalledOnce()
+
+        // It dies again, and is restarted after the first delay, not a longer one
+        syncService.emitSyncState(SyncState.Error)
+        advanceTimeBy(FIRST_RESTART_DELAY / 2)
+        startSyncRecorder.assertions().isCalledOnce()
+        advanceTimeBy(FIRST_RESTART_DELAY)
+        startSyncRecorder.assertions().isCalledExactly(2)
+    }
+
+    @Test
+    fun `when the sync service is in error but the app is in background, it is not restarted`() = runTest {
+        val startSyncRecorder = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val syncService = FakeSyncService(initialSyncState = SyncState.Error).apply {
+            startSyncLambda = startSyncRecorder
+        }
+        val syncOrchestrator = createSyncOrchestrator(
+            matrixClient = FakeMatrixClient(syncService = syncService),
+            networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Connected),
+            appForegroundStateService = FakeAppForegroundStateService(initialForegroundValue = false),
+        )
+
+        // We start observing
+        syncOrchestrator.observeStates()
+
+        advanceTimeBy(MAX_RESTART_DELAY * 2)
+        startSyncRecorder.assertions().isNeverCalled()
+    }
+
+    @Test
+    fun `when the sync service is in error but there is no network, it is not restarted`() = runTest {
+        val startSyncRecorder = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
+        val syncService = FakeSyncService(initialSyncState = SyncState.Error).apply {
+            startSyncLambda = startSyncRecorder
+        }
+        val syncOrchestrator = createSyncOrchestrator(
+            matrixClient = FakeMatrixClient(syncService = syncService),
+            networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Disconnected),
+            appForegroundStateService = FakeAppForegroundStateService(initialForegroundValue = true),
+        )
+
+        // We start observing
+        syncOrchestrator.observeStates()
+
+        advanceTimeBy(MAX_RESTART_DELAY * 2)
+        startSyncRecorder.assertions().isNeverCalled()
+    }
+
     private fun TestScope.createSyncOrchestrator(
         matrixClient: FakeMatrixClient = FakeMatrixClient(),
         networkMonitor: FakeNetworkMonitor = FakeNetworkMonitor(),

From c643acda387bc96d2650760a0d2ceb9d9af304cb Mon Sep 17 00:00:00 2001
From: ElementBot <android@element.io>
Date: Fri, 11 Sep 2026 11:08:34 +0000
Subject: [PATCH 03/20] Update screenshots

---
 .../libraries.ui.common.nodes_EmptyViewLoading_Day_0_en.png    | 3 +++
 .../libraries.ui.common.nodes_EmptyViewLoading_Night_0_en.png  | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewLoading_Day_0_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewLoading_Night_0_en.png

diff --git a/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewLoading_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewLoading_Day_0_en.png
new file mode 100644
index 0000000000..0db7c3fe4a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewLoading_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f696c5c13677bc4e08602fd54b150b14a738bdcdd3cff2fd77c0634006505b03
+size 6793
diff --git a/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewLoading_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewLoading_Night_0_en.png
new file mode 100644
index 0000000000..172188ba64
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewLoading_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:883108c96ef47f0fb8ec6f8160386c880f198a36212555614c734983a97cd667
+size 6787

From e7372c7f49552bbe905b94e3117ade78460a100d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 11 Sep 2026 16:42:22 +0200
Subject: [PATCH 04/20] Use PreviewParameterProvider

---
 .../ui/common/nodes/DurationPreviewParam.kt   | 20 ++++++
 .../libraries/ui/common/nodes/EmptyNode.kt    | 60 ----------------
 .../libraries/ui/common/nodes/EmptyView.kt    | 68 +++++++++++++++++++
 3 files changed, 88 insertions(+), 60 deletions(-)
 create mode 100644 libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/DurationPreviewParam.kt
 create mode 100644 libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyView.kt

diff --git a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/DurationPreviewParam.kt b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/DurationPreviewParam.kt
new file mode 100644
index 0000000000..4cf621c51c
--- /dev/null
+++ b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/DurationPreviewParam.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.ui.common.nodes
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
+
+open class DurationPreviewParam : PreviewParameterProvider<Duration> {
+    override val values: Sequence<Duration>
+        get() = sequenceOf(
+            Duration.INFINITE,
+            1.seconds,
+        )
+}
diff --git a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyNode.kt b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyNode.kt
index 7d9e851e89..5e8131f23d 100644
--- a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyNode.kt
+++ b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyNode.kt
@@ -8,28 +8,10 @@
 
 package io.element.android.libraries.ui.common.nodes
 
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.node.node
-import io.element.android.compound.theme.ElementTheme
-import io.element.android.libraries.designsystem.preview.ElementPreview
-import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
-import io.element.android.libraries.designsystem.theme.components.Text
-import io.element.android.libraries.designsystem.utils.DelayedVisibility
-import io.element.android.libraries.ui.strings.CommonStrings
 import kotlin.time.Duration
-import kotlin.time.Duration.Companion.seconds
 
 /**
  * Ref: https://www.figma.com/design/0MMNu7cTOzLOlWb7ctTkv3/Element-X?node-id=1518-85323
@@ -48,45 +30,3 @@ fun emptyNode(
         modifier = modifier,
     )
 }
-
-@Composable
-private fun EmptyView(
-    delayBeforeShowingContent: Duration,
-    modifier: Modifier = Modifier,
-) = Box(
-    modifier = modifier
-        .fillMaxSize()
-        .background(ElementTheme.colors.bgCanvasDefault),
-    contentAlignment = Alignment.Center,
-) {
-    if (delayBeforeShowingContent.isFinite()) {
-        DelayedVisibility(duration = delayBeforeShowingContent) {
-            LoadingContent()
-        }
-    }
-}
-
-@Composable
-private fun LoadingContent() = Column(
-    horizontalAlignment = Alignment.CenterHorizontally,
-    verticalArrangement = Arrangement.spacedBy(16.dp),
-) {
-    CircularProgressIndicator()
-    Text(
-        text = stringResource(CommonStrings.common_loading),
-        color = ElementTheme.colors.textSecondary,
-        style = ElementTheme.typography.fontBodyMdRegular,
-    )
-}
-
-@PreviewsDayNight
-@Composable
-internal fun EmptyViewPreview() = ElementPreview {
-    EmptyView(delayBeforeShowingContent = Duration.INFINITE)
-}
-
-@PreviewsDayNight
-@Composable
-internal fun EmptyViewLoadingPreview() = ElementPreview {
-    EmptyView(delayBeforeShowingContent = 1.seconds)
-}
diff --git a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyView.kt b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyView.kt
new file mode 100644
index 0000000000..f9979790f2
--- /dev/null
+++ b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyView.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.ui.common.nodes
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.utils.DelayedVisibility
+import io.element.android.libraries.ui.strings.CommonStrings
+import kotlin.time.Duration
+
+@Composable
+fun EmptyView(
+    delayBeforeShowingContent: Duration,
+    modifier: Modifier = Modifier,
+) = Box(
+    modifier = modifier
+        .fillMaxSize()
+        .background(ElementTheme.colors.bgCanvasDefault),
+    contentAlignment = Alignment.Center,
+) {
+    if (delayBeforeShowingContent.isFinite()) {
+        DelayedVisibility(duration = delayBeforeShowingContent) {
+            LoadingContent()
+        }
+    }
+}
+
+@Composable
+private fun LoadingContent() = Column(
+    modifier = Modifier.padding(16.dp),
+    horizontalAlignment = Alignment.CenterHorizontally,
+    verticalArrangement = Arrangement.spacedBy(16.dp),
+) {
+    CircularProgressIndicator()
+    Text(
+        text = stringResource(CommonStrings.common_loading),
+        color = ElementTheme.colors.textSecondary,
+        style = ElementTheme.typography.fontBodyMdRegular,
+    )
+}
+
+@PreviewsDayNight
+@Composable
+internal fun EmptyViewPreview(
+    @PreviewParameter(DurationPreviewParam::class) duration: Duration
+) = ElementPreview {
+    EmptyView(delayBeforeShowingContent = duration)
+}

From b28b2ceeed1ea9edef2e7628544552a186a44450 Mon Sep 17 00:00:00 2001
From: ElementBot <android@element.io>
Date: Fri, 11 Sep 2026 15:04:02 +0000
Subject: [PATCH 05/20] Update screenshots

---
 ...braries.ui.common.nodes_EmptyViewPreview-KLykuaI_Day_0_en.png} | 0
 ...braries.ui.common.nodes_EmptyViewPreview-KLykuaI_Day_1_en.png} | 0
 ...aries.ui.common.nodes_EmptyViewPreview-KLykuaI_Night_0_en.png} | 0
 ...aries.ui.common.nodes_EmptyViewPreview-KLykuaI_Night_1_en.png} | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/uitests/src/test/snapshots/images/{libraries.ui.common.nodes_EmptyView_Day_0_en.png => libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Day_0_en.png} (100%)
 rename tests/uitests/src/test/snapshots/images/{libraries.ui.common.nodes_EmptyViewLoading_Day_0_en.png => libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Day_1_en.png} (100%)
 rename tests/uitests/src/test/snapshots/images/{libraries.ui.common.nodes_EmptyView_Night_0_en.png => libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Night_0_en.png} (100%)
 rename tests/uitests/src/test/snapshots/images/{libraries.ui.common.nodes_EmptyViewLoading_Night_0_en.png => libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Night_1_en.png} (100%)

diff --git a/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Day_0_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyView_Day_0_en.png
rename to tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Day_0_en.png
diff --git a/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewLoading_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Day_1_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewLoading_Day_0_en.png
rename to tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Day_1_en.png
diff --git a/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Night_0_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyView_Night_0_en.png
rename to tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Night_0_en.png
diff --git a/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewLoading_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Night_1_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewLoading_Night_0_en.png
rename to tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Night_1_en.png

From 25505d6e8aaeb1e5dddd3e32e5b4afe28317126b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Sep 2026 10:00:43 +0200
Subject: [PATCH 06/20] Do not automatically restart the sync in case it is
 Terminated. Also simplify the computation of the backoff delay.

---
 .../appnav/session/SyncOrchestrator.kt        | 25 ++++++++++---------
 .../android/appnav/SyncOrchestratorTest.kt    | 25 +++----------------
 2 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/session/SyncOrchestrator.kt b/appnav/src/main/kotlin/io/element/android/appnav/session/SyncOrchestrator.kt
index 786365b7be..9863f75410 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/session/SyncOrchestrator.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/session/SyncOrchestrator.kt
@@ -138,7 +138,7 @@ class SyncOrchestrator(
                 SyncStateAction.StopSync
             } else if (syncState == SyncState.Idle && isAppActive && isNetworkAvailable) {
                 SyncStateAction.StartSync
-            } else if (syncState.isDead() && isAppActive && isNetworkAvailable) {
+            } else if (syncState == SyncState.Error && isAppActive && isNetworkAvailable) {
                 // The sync service has given up, for instance because the homeserver has expired our sliding sync
                 // session and answered 400 M_UNKNOWN_POS. Nothing else will ever restart it, so do it from here,
                 // else the application is stuck until its data is cleared.
@@ -184,8 +184,18 @@ class SyncOrchestrator(
 @VisibleForTesting
 internal val FIRST_RESTART_DELAY = 1.seconds
 
+/**
+ * Exponential backoff, from [FIRST_RESTART_DELAY], doubling on every attempt, up to [FIRST_RESTART_DELAY * 32].
+ */
 @VisibleForTesting
-internal val MAX_RESTART_DELAY = 30.seconds
+internal val RESTART_BACKOFF_DELAYS = listOf(
+    FIRST_RESTART_DELAY,
+    FIRST_RESTART_DELAY * 2,
+    FIRST_RESTART_DELAY * 4,
+    FIRST_RESTART_DELAY * 8,
+    FIRST_RESTART_DELAY * 16,
+    FIRST_RESTART_DELAY * 32,
+)
 
 /**
  * Duration during which the sync service has to stay running before the restart backoff is reset.
@@ -193,17 +203,8 @@ internal val MAX_RESTART_DELAY = 30.seconds
 @VisibleForTesting
 internal val RESTART_BACKOFF_RESET_DELAY = 30.seconds
 
-/**
- * Return true if the sync service has stopped and will not restart by itself.
- */
-private fun SyncState.isDead() = this == SyncState.Error || this == SyncState.Terminated
-
-/**
- * Exponential backoff, from [FIRST_RESTART_DELAY], doubling on every attempt, up to [MAX_RESTART_DELAY].
- */
 private fun restartDelay(attempt: Int): Duration {
-    val exponent = attempt.coerceIn(0, 5)
-    return (FIRST_RESTART_DELAY * (1 shl exponent)).coerceAtMost(MAX_RESTART_DELAY)
+    return RESTART_BACKOFF_DELAYS[attempt.coerceIn(0, RESTART_BACKOFF_DELAYS.lastIndex)]
 }
 
 private enum class SyncStateAction {
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/SyncOrchestratorTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/SyncOrchestratorTest.kt
index 9475399a85..af53c68b3d 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/SyncOrchestratorTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/SyncOrchestratorTest.kt
@@ -9,7 +9,7 @@
 package io.element.android.appnav
 
 import io.element.android.appnav.session.FIRST_RESTART_DELAY
-import io.element.android.appnav.session.MAX_RESTART_DELAY
+import io.element.android.appnav.session.RESTART_BACKOFF_DELAYS
 import io.element.android.appnav.session.RESTART_BACKOFF_RESET_DELAY
 import io.element.android.appnav.session.SyncOrchestrator
 import io.element.android.features.networkmonitor.api.NetworkStatus
@@ -441,25 +441,6 @@ class SyncOrchestratorTest {
         startSyncRecorder.assertions().isCalledOnce()
     }
 
-    @Test
-    fun `when the sync service is terminated, it will be restarted after a delay`() = runTest {
-        val startSyncRecorder = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
-        val syncService = FakeSyncService(initialSyncState = SyncState.Terminated).apply {
-            startSyncLambda = startSyncRecorder
-        }
-        val syncOrchestrator = createSyncOrchestrator(
-            matrixClient = FakeMatrixClient(syncService = syncService),
-            networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Connected),
-            appForegroundStateService = FakeAppForegroundStateService(initialForegroundValue = true),
-        )
-
-        // We start observing
-        syncOrchestrator.observeStates()
-
-        advanceTimeBy(FIRST_RESTART_DELAY * 2)
-        startSyncRecorder.assertions().isCalledOnce()
-    }
-
     @Test
     fun `when the sync service keeps dying, the delay between the restarts increases`() = runTest {
         val startSyncRecorder = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
@@ -538,7 +519,7 @@ class SyncOrchestratorTest {
         // We start observing
         syncOrchestrator.observeStates()
 
-        advanceTimeBy(MAX_RESTART_DELAY * 2)
+        advanceTimeBy(RESTART_BACKOFF_DELAYS.last() * 2)
         startSyncRecorder.assertions().isNeverCalled()
     }
 
@@ -557,7 +538,7 @@ class SyncOrchestratorTest {
         // We start observing
         syncOrchestrator.observeStates()
 
-        advanceTimeBy(MAX_RESTART_DELAY * 2)
+        advanceTimeBy(RESTART_BACKOFF_DELAYS.last() * 2)
         startSyncRecorder.assertions().isNeverCalled()
     }
 

From c512e3f299b31d7c8cfe254f66a543ddd76cb79d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 15 Sep 2026 10:52:45 +0200
Subject: [PATCH 07/20] Introduce an EmptyState, so that screenshot filename
 stays consistent.

---
 .../element/android/appnav/LoggedInFlowNode.kt |  3 ++-
 .../android/features/ftue/impl/FtueFlowNode.kt |  3 ++-
 .../libraries/ui/common/nodes/EmptyNode.kt     |  8 +++-----
 .../libraries/ui/common/nodes/EmptyState.kt    | 18 ++++++++++++++++++
 ...eviewParam.kt => EmptyStatePreviewParam.kt} |  8 ++++----
 .../libraries/ui/common/nodes/EmptyView.kt     | 11 +++++------
 ...ies.ui.common.nodes_EmptyView_Day_0_en.png} |  0
 ...ies.ui.common.nodes_EmptyView_Day_1_en.png} |  0
 ...s.ui.common.nodes_EmptyView_Night_0_en.png} |  0
 ...s.ui.common.nodes_EmptyView_Night_1_en.png} |  0
 10 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyState.kt
 rename libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/{DurationPreviewParam.kt => EmptyStatePreviewParam.kt} (68%)
 rename tests/uitests/src/test/snapshots/images/{libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Day_0_en.png => libraries.ui.common.nodes_EmptyView_Day_0_en.png} (100%)
 rename tests/uitests/src/test/snapshots/images/{libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Day_1_en.png => libraries.ui.common.nodes_EmptyView_Day_1_en.png} (100%)
 rename tests/uitests/src/test/snapshots/images/{libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Night_0_en.png => libraries.ui.common.nodes_EmptyView_Night_0_en.png} (100%)
 rename tests/uitests/src/test/snapshots/images/{libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Night_1_en.png => libraries.ui.common.nodes_EmptyView_Night_1_en.png} (100%)

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
index 4254d66664..a0bcf3b489 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -96,6 +96,7 @@ import io.element.android.libraries.matrix.api.verification.SessionVerificationS
 import io.element.android.libraries.matrix.api.verification.VerificationRequest
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import io.element.android.libraries.push.api.notifications.conversations.NotificationConversationService
+import io.element.android.libraries.ui.common.nodes.EmptyState
 import io.element.android.libraries.ui.common.nodes.emptyNode
 import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
 import io.element.android.services.analytics.api.AnalyticsService
@@ -327,7 +328,7 @@ class LoggedInFlowNode(
         return when (navTarget) {
             // Rendered while the FtueState is Unknown. Render a loading state rather than nothing at all,
             // since there is no guarantee that this state will be left.
-            NavTarget.Placeholder -> emptyNode(buildContext, delayBeforeShowingContent = 500.milliseconds)
+            NavTarget.Placeholder -> emptyNode(buildContext, state = EmptyState(delayBeforeShowingContent = 500.milliseconds))
             NavTarget.LoggedInPermanent -> {
                 val callback = object : LoggedInNode.Callback {
                     override fun navigateToNotificationTroubleshoot() {
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt
index b3d96a88e5..461fc4ea80 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt
@@ -32,6 +32,7 @@ import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.ui.common.nodes.EmptyState
 import io.element.android.libraries.ui.common.nodes.emptyNode
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
@@ -88,7 +89,7 @@ class FtueFlowNode(
                 // Rendered while waiting for the initial state (see FtueStep.WaitingForInitialState).
                 // This can last for a while, or forever if the sync service never manages to run, so
                 // render a loading state rather than nothing at all.
-                emptyNode(buildContext, delayBeforeShowingContent = 500.milliseconds)
+                emptyNode(buildContext, EmptyState(delayBeforeShowingContent = 500.milliseconds))
             }
             is NavTarget.SessionVerification -> {
                 val callback = object : FtueSessionVerificationFlowNode.Callback {
diff --git a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyNode.kt b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyNode.kt
index 5e8131f23d..1e7e1b8d21 100644
--- a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyNode.kt
+++ b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyNode.kt
@@ -17,16 +17,14 @@ import kotlin.time.Duration
  * Ref: https://www.figma.com/design/0MMNu7cTOzLOlWb7ctTkv3/Element-X?node-id=1518-85323
  *
  * @param buildContext the [BuildContext] of the Node.
- * @param delayBeforeShowingContent when finite, a loading indicator fades in after this delay. Use it for
- * placeholders which can stay on screen for a long time, or forever, else the application looks frozen.
- * Defaults to [Duration.INFINITE], i.e. the Node stays empty.
+ * @param state the [EmptyState] of the Node. Default value will render an empty node forever.
  */
 fun emptyNode(
     buildContext: BuildContext,
-    delayBeforeShowingContent: Duration = Duration.INFINITE,
+    state: EmptyState = EmptyState(Duration.INFINITE),
 ): Node = node(buildContext) { modifier ->
     EmptyView(
-        delayBeforeShowingContent = delayBeforeShowingContent,
+        state = state,
         modifier = modifier,
     )
 }
diff --git a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyState.kt b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyState.kt
new file mode 100644
index 0000000000..0930523881
--- /dev/null
+++ b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyState.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.ui.common.nodes
+
+import kotlin.time.Duration
+
+/**
+ * @property delayBeforeShowingContent when finite, a loading indicator fades in after this delay. Use it for
+ * placeholders which can stay on screen for a long time, or forever, else the application looks frozen.
+ */
+data class EmptyState(
+    val delayBeforeShowingContent: Duration,
+)
diff --git a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/DurationPreviewParam.kt b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyStatePreviewParam.kt
similarity index 68%
rename from libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/DurationPreviewParam.kt
rename to libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyStatePreviewParam.kt
index 4cf621c51c..c0f1705276 100644
--- a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/DurationPreviewParam.kt
+++ b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyStatePreviewParam.kt
@@ -11,10 +11,10 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
-open class DurationPreviewParam : PreviewParameterProvider<Duration> {
-    override val values: Sequence<Duration>
+open class EmptyStatePreviewParam : PreviewParameterProvider<EmptyState> {
+    override val values: Sequence<EmptyState>
         get() = sequenceOf(
-            Duration.INFINITE,
-            1.seconds,
+            EmptyState(Duration.INFINITE),
+            EmptyState(1.seconds),
         )
 }
diff --git a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyView.kt b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyView.kt
index f9979790f2..77ff6555a5 100644
--- a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyView.kt
+++ b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/EmptyView.kt
@@ -26,11 +26,10 @@ import io.element.android.libraries.designsystem.theme.components.CircularProgre
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.utils.DelayedVisibility
 import io.element.android.libraries.ui.strings.CommonStrings
-import kotlin.time.Duration
 
 @Composable
 fun EmptyView(
-    delayBeforeShowingContent: Duration,
+    state: EmptyState,
     modifier: Modifier = Modifier,
 ) = Box(
     modifier = modifier
@@ -38,8 +37,8 @@ fun EmptyView(
         .background(ElementTheme.colors.bgCanvasDefault),
     contentAlignment = Alignment.Center,
 ) {
-    if (delayBeforeShowingContent.isFinite()) {
-        DelayedVisibility(duration = delayBeforeShowingContent) {
+    if (state.delayBeforeShowingContent.isFinite()) {
+        DelayedVisibility(duration = state.delayBeforeShowingContent) {
             LoadingContent()
         }
     }
@@ -62,7 +61,7 @@ private fun LoadingContent() = Column(
 @PreviewsDayNight
 @Composable
 internal fun EmptyViewPreview(
-    @PreviewParameter(DurationPreviewParam::class) duration: Duration
+    @PreviewParameter(EmptyStatePreviewParam::class) state: EmptyState
 ) = ElementPreview {
-    EmptyView(delayBeforeShowingContent = duration)
+    EmptyView(state = state)
 }
diff --git a/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyView_Day_0_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Day_0_en.png
rename to tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyView_Day_0_en.png
diff --git a/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyView_Day_1_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Day_1_en.png
rename to tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyView_Day_1_en.png
diff --git a/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyView_Night_0_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Night_0_en.png
rename to tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyView_Night_0_en.png
diff --git a/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyView_Night_1_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyViewPreview-KLykuaI_Night_1_en.png
rename to tests/uitests/src/test/snapshots/images/libraries.ui.common.nodes_EmptyView_Night_1_en.png

From 47b8261fb27cc8ddc1abf6de2d4236851c408718 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 17 Sep 2026 12:54:22 +0000
Subject: [PATCH 08/20] Update dependency androidx.sqlite:sqlite-ktx to v2.7.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fb3a7f37f5..696fe6fa09 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -206,7 +206,7 @@ sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", ver
 sqldelight-driver-jvm = { module = "app.cash.sqldelight:sqlite-driver", version.ref = "sqldelight" }
 sqldelight-coroutines = { module = "app.cash.sqldelight:coroutines-extensions", version.ref = "sqldelight" }
 sqlcipher = "net.zetetic:sqlcipher-android:4.19.0"
-sqlite = "androidx.sqlite:sqlite-ktx:2.7.0"
+sqlite = "androidx.sqlite:sqlite-ktx:2.7.1"
 unifiedpush = "org.unifiedpush.android:connector:3.3.5"
 vanniktech_blurhash = "com.vanniktech:blurhash:0.3.0"
 telephoto_zoomableimage = { module = "me.saket.telephoto:zoomable-image-coil3", version.ref = "telephoto" }

From 9396349b39da268d72fc76ccb95c115d37398cee Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 17 Sep 2026 13:45:51 +0000
Subject: [PATCH 09/20] Update dependency androidx.compose:compose-bom to
 v2026.09.00

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fb3a7f37f5..a0c4dfdd1c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -22,7 +22,7 @@ camera = "1.6.2"
 work = "2.11.2"
 
 # Compose
-compose_bom = "2026.08.00"
+compose_bom = "2026.09.00"
 
 # Coroutines
 coroutines = "1.11.0"

From 0e4533045ddcdc6236e15194df0d185dbeb658d1 Mon Sep 17 00:00:00 2001
From: ElementBot <android@element.io>
Date: Thu, 17 Sep 2026 15:13:36 +0000
Subject: [PATCH 10/20] Update screenshots

---
 ...nts.preview.imageeditor_AttachmentImageEditorView_2_en.png | 4 ++--
 ...nts.preview.imageeditor_AttachmentImageEditorView_5_en.png | 4 ++--
 ...rypto.identity_MessagesViewWithIdentityChange_Day_0_en.png | 4 ++--
 ...rypto.identity_MessagesViewWithIdentityChange_Day_1_en.png | 4 ++--
 ...rypto.identity_MessagesViewWithIdentityChange_Day_2_en.png | 4 ++--
 ...pto.identity_MessagesViewWithIdentityChange_Night_0_en.png | 4 ++--
 ...pto.identity_MessagesViewWithIdentityChange_Night_1_en.png | 4 ++--
 ...pto.identity_MessagesViewWithIdentityChange_Night_2_en.png | 4 ++--
 ...re.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png | 4 ++--
 ...re.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png | 4 ++--
 ....resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png | 4 ++--
 ....resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png | 4 ++--
 ...meline.components.event_ATimelineItemEventRow_Day_0_en.png | 4 ++--
 ...line.components.event_ATimelineItemEventRow_Night_0_en.png | 4 ++--
 ....components_TimelineItemEventRowDisambiguated_Day_0_en.png | 4 ++--
 ...omponents_TimelineItemEventRowDisambiguated_Night_0_en.png | 4 ++--
 ...ents_TimelineItemEventRowWithReplyInformative_Day_0_en.png | 4 ++--
 ...ents_TimelineItemEventRowWithReplyInformative_Day_1_en.png | 4 ++--
 ...ts_TimelineItemEventRowWithReplyInformative_Night_0_en.png | 4 ++--
 ...ts_TimelineItemEventRowWithReplyInformative_Night_1_en.png | 4 ++--
 ...components_TimelineItemEventRowWithReplyOther_Day_0_en.png | 4 ++--
 ...components_TimelineItemEventRowWithReplyOther_Day_1_en.png | 4 ++--
 ...mponents_TimelineItemEventRowWithReplyOther_Night_0_en.png | 4 ++--
 ...mponents_TimelineItemEventRowWithReplyOther_Night_1_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_0_en.png | 4 ++--
 ...ine.components_TimelineItemEventRowWithReply_Day_10_en.png | 4 ++--
 ...ine.components_TimelineItemEventRowWithReply_Day_11_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_1_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_2_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_3_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_4_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_5_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_6_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_7_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_8_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_9_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_0_en.png | 4 ++--
 ...e.components_TimelineItemEventRowWithReply_Night_10_en.png | 4 ++--
 ...e.components_TimelineItemEventRowWithReply_Night_11_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_1_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_2_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_3_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_4_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_5_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_6_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_7_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_8_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_9_en.png | 4 ++--
 .../images/features.messages.impl_MessagesView_Day_12_en.png  | 4 ++--
 .../images/features.messages.impl_MessagesView_Night_0_en.png | 4 ++--
 .../features.messages.impl_MessagesView_Night_10_en.png       | 4 ++--
 .../features.messages.impl_MessagesView_Night_12_en.png       | 4 ++--
 .../images/features.messages.impl_MessagesView_Night_2_en.png | 4 ++--
 .../images/features.messages.impl_MessagesView_Night_4_en.png | 4 ++--
 .../images/features.messages.impl_MessagesView_Night_6_en.png | 4 ++--
 .../images/features.messages.impl_MessagesView_Night_8_en.png | 4 ++--
 ...references.impl.blockedusers_BlockedUsersView_Day_4_en.png | 4 ++--
 ...references.impl.blockedusers_BlockedUsersView_Day_5_en.png | 4 ++--
 ...ferences.impl.blockedusers_BlockedUsersView_Night_4_en.png | 4 ++--
 ...ferences.impl.blockedusers_BlockedUsersView_Night_5_en.png | 4 ++--
 ...es.preferences.impl.userstatus_UserStatusView_Day_5_en.png | 4 ++--
 ...es.preferences.impl.userstatus_UserStatusView_Day_6_en.png | 4 ++--
 ....preferences.impl.userstatus_UserStatusView_Night_5_en.png | 4 ++--
 ....preferences.impl.userstatus_UserStatusView_Night_6_en.png | 4 ++--
 ...embermoderation.impl_RoomMemberModerationView_Day_5_en.png | 4 ++--
 ...embermoderation.impl_RoomMemberModerationView_Day_7_en.png | 4 ++--
 ...bermoderation.impl_RoomMemberModerationView_Night_5_en.png | 4 ++--
 ...bermoderation.impl_RoomMemberModerationView_Night_7_en.png | 4 ++--
 ...eme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png | 4 ++--
 ...e.components_HorizontalFloatingToolbarNoFab_Night_0_en.png | 4 ++--
 ...em.theme.components_HorizontalFloatingToolbar_Day_0_en.png | 4 ++--
 ....theme.components_HorizontalFloatingToolbar_Night_0_en.png | 4 ++--
 72 files changed, 144 insertions(+), 144 deletions(-)

diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_en.png
index 3192cf2a5e..8edee63bc1 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1885bbe8b0ea497ac20d7bcdd0c6a93ba0533e898378d35e1cafdc8c9924fd56
-size 279984
+oid sha256:de82970da241172b94f822f8792e6fc721dcfc7f0f67e3523962e253e9750884
+size 255933
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_en.png
index f899ad5d43..ccfdd7d9ed 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ca032575e4ebd75a2ebc5a4cb9f966e48cdfa56f4ff42d6d9309fa3577a1adb
-size 310609
+oid sha256:fe6cb72de5079be2ac02ec39f74bac0d20492cd6f5509b71ad9cfc4cc52955d3
+size 326468
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en.png
index 693a36b7dd..5f51b27f5e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3dbb8ef39b6a7a0c2f576d8bd101aa97c89da696f23e6d5836846494471c01a1
-size 55799
+oid sha256:3274314ab9e39c23a6b9d66adf80ac8bb7b364ce60a300f96582374a18bc821f
+size 54590
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png
index b1850a50a5..e1f6ee6430 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1dd0da147212e13a6c0ad5ad8f85ce55666c444076c238ea27eba5605cfab1f
-size 56909
+oid sha256:5e27c7c51fe07cca51b92a601aa9c58deab609bfa5e82f8f6f88eaab6ae59ec3
+size 64307
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en.png
index 4185f46b51..5289eaca63 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:085963fcb425147d35a9ad947a7a3e4ba4712bd3d2f32e93099ff15cffe83b88
-size 64761
+oid sha256:65f9ee083a73669a0d3f9d88141a610ea53f3c39e89d8f706d414b04555b4764
+size 59321
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en.png
index 2e70435fa5..d3f7da6320 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a3667390d9d88894bbdd5d72b0b714b29c9ff160653e310e97b0da87b6ba8b0
-size 54724
+oid sha256:8a94a4cc176b5d52ef9b21339749324adeef9857b6cdaa2ae973903e2408662a
+size 55904
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png
index 0f6de1b844..bd3b0196d6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28512b0fda0b71b98eab03cee15c9d3163825b1a3545670cfa277ddd5434c87a
-size 58417
+oid sha256:6f7f7415abbe51858f938e16ad03c6aab983fb3d5e2a53a028bae3c031446646
+size 67848
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en.png
index 6c774d4cec..f4d51ccc61 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ed6a5f1a2055e19a6b8fb0af4738845bd2184f755c323022c52154cdfa07e05
-size 60909
+oid sha256:8a8f5aaaa7ebb0e61b07867590d99a8791c5d04cad1ce0f334d23dce6f26c6e6
+size 67276
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png
index 02d0fc8eeb..bd73e322ab 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f77d8243c23d3f37dff86dec53671cbde9fafe1314f6e6b445abdfe47d751ad6
-size 56187
+oid sha256:12020ba97720f2374f9ace172693f08be01522e4ca30d3970efa91d802581e81
+size 3657
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png
index bd73e322ab..93622cedfe 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12020ba97720f2374f9ace172693f08be01522e4ca30d3970efa91d802581e81
-size 3657
+oid sha256:87193a7c9eb9d40234970e5f5be02e80f2b3ffe91e2c9ca6afd58b8bccdd5911
+size 55075
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png
index 0cf6c10c4e..bd73e322ab 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49f0bb16d3d57b59242e704e3dd4e8885c59721a42129837ff6a4f0d7d02de11
-size 54433
+oid sha256:12020ba97720f2374f9ace172693f08be01522e4ca30d3970efa91d802581e81
+size 3657
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png
index adec213a8c..bd73e322ab 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ebee4aec3dbab6e1bb05fda7c5e423f0e931560743d0f0ccbac6b70fa9ad808
-size 52921
+oid sha256:12020ba97720f2374f9ace172693f08be01522e4ca30d3970efa91d802581e81
+size 3657
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_en.png
index 12bd190dd1..0ab00359b7 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce15ca9f89274620728715e3448ce671e2253f4fed22a44035460e9a3709ca0b
-size 647404
+oid sha256:7b5e6f4c5ec97e67bb20f03f25f18d9f32d5d1aed5ff30d161b331894ad03443
+size 647384
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Night_0_en.png
index 160d58f9ec..0ccdcbb603 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4e7b28b78cfbcbb6abf00317eea945859ac6465cecf81a3ad15801b0de721e4
-size 646216
+oid sha256:d0424685437a433b35b589668b409d55f26ab41bcae01af0121a54033c56a8c2
+size 646194
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en.png
index 0435f55de6..ab6392a424 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff839731834d7d0c94fa9a2c412014ddbaeaa053c5af1c8cbd00a3f3a583f364
-size 379511
+oid sha256:94f89a37549a3f198442db467bc7d8539f0b5649d97927bfe731f090d6dfb03d
+size 379505
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en.png
index 9cbd5c1d95..f0b5506b89 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0e170b4bea262de612bf3374d475fcd25470ff91b7554d20809c51857a78cec
-size 377963
+oid sha256:04ea6c2947a21d3d4a3d43e9c4750c4f2a49056536a4da3f34c95df8353e9de3
+size 377990
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en.png
index 1f0fdabe6d..3ac59caeea 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8bb5a6de6601da8d7fe59f110a054577e2e25dae4bb449f60c04e7d7a1b9551
-size 365073
+oid sha256:1a94d5198e27338675c0e15df5874ba3272ee315b8d77291dc7ccc7c754ed1f4
+size 365082
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en.png
index 86018764ac..195aa04fe2 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8344427a0fe87cbf0883ff53a9ee4dcf90976a7011f6618d85961df48b2c53a9
-size 370228
+oid sha256:76e5ae44362792d570cd82f3910c8bd0acde509b8418c5892e0385e7d636f042
+size 370223
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en.png
index 058a3992c3..29771235f0 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00fe1e676086766a3eac3e4457eff52c989789fc5d8d0df2624c019ed25ce9af
-size 363322
+oid sha256:60b9f2b920cd2a2a414805d1f0f77925232d9ae60bd607fa18d4395cda2dd73d
+size 363291
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en.png
index c6d4541184..db4ea8296a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c00e504593d8eb61b598f05f46ee4d591757975a80c0b4227b240847d2cd4868
-size 368510
+oid sha256:2f0d24b8011564ee7a8b2f8c2e6a24eda668ee42d451d862f884acb7926aa06c
+size 368529
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en.png
index 84d9d4e5c3..94428abb56 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c609a633ab23eae5729ecb57a17a385bac65e81cbf0180c01e0847f1028039e
-size 347890
+oid sha256:36d7cf2510d546d2b330b1d1b1674ce58df0558c547e443794a1e7b2222add87
+size 347897
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en.png
index 40fa5d563f..5400a98a50 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ff97eb99daf65f74b469d51b93bd77d304d0c780b9406e1c4d7893b71e3c68d
-size 367163
+oid sha256:40a23ddff1fe46a486a5d34d94e0e67ec14d0b2b9c6bee2ddbadc17ce0948b7b
+size 367131
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en.png
index bac23aab98..22ff4965d1 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e30686c7c037ef102717e0316543faf4d3ed2671c21eca96a667150daab380d6
-size 346614
+oid sha256:787151f8f242a8794a804bf14831f6ca680814d617e85feb3652103e8a0f20cd
+size 346565
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en.png
index 2348755afd..c3b6a086fe 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e907f67ef884edb61df187f0f229ed4ff4cb31f8c276f807698f861c0e7a4c27
-size 364124
+oid sha256:0e615c14cd23f3efd217ec20ce05ed32be76dc3317091e8221f1a72a5a594d92
+size 364175
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en.png
index 01d4dca84b..67490ba700 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef2bf449671b652cb152b3baab92ab100eab77a54229ab49daeab156f2f484d0
-size 369724
+oid sha256:f4431e2d9f30123949ea5676ce60f642234adcf9b5a33f2acc3f80ebf6609a66
+size 369730
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en.png
index f0dfbc3321..1600afff71 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7a6302320bd1e4258e03487539bf46b0b12781dfc8a22b3f9f267017a6146fa
-size 354751
+oid sha256:273351cc9c533b2424859a0de00a8a3786628abc3a88175705c4205dedf7e9aa
+size 354737
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en.png
index e38cf03ad6..c4943b892c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:41a0e404dea7f52359b24b3ec3926b1405429b165cfed44c63b3922ea6d3cb46
-size 368114
+oid sha256:4c410e853089cc2c4a2c48a00dd9a8babc8095aed72bb4625057444710559c6c
+size 368129
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en.png
index 68f8148879..b5dac8434c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ca8cf82aa8ab1bdad56a27584b27789402aeb7ad8fadd038280a376fb75a72c
-size 345094
+oid sha256:1a92f8af94682facac66d4aacb6e49f345561c15be2f8b689041b78aeaaae831
+size 345062
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en.png
index 8aa2cca147..1b99468924 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02ecb903124273e24151ea2088f6b99144f7dcadba00a582b6210dd23835b5c9
-size 357743
+oid sha256:3a9509411777f342261cab58b92a022b3c9f8f0f7a9e4d0527120a91976575f0
+size 357733
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en.png
index b5032c29b3..cececc229a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dce23463c335d01eb67293cfcede5d85e96ab2ba035cc9a188d42e8e6866bc63
-size 356831
+oid sha256:f0c6dafaa41849af00d5097a85bd88e3a054a0a9e41c0466a08e6ff8dd6102b2
+size 356857
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en.png
index a332744358..14a40a5676 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:588967869cbd25ed8b82aff5618175660a8a9e45a5a861b1c7867cf1913f575b
-size 364646
+oid sha256:a11044fe90227f1f316a1ade8587e545bb620e11cca76865fc2eb83cdb817fc5
+size 364655
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en.png
index 133fd3903f..d7b969fd5b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:426d1c844a8c88281c5fa4c61916d93278fdfd38f8cdf2dc54bf1a821f2de3eb
-size 397167
+oid sha256:2528df873713755f542f61cd794080929586c1bd5f316c0378ce9e837c21d50b
+size 397145
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en.png
index 0041a870b9..63bd9c3f6d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2bd77c08be705c66225f16c29fd6826decd92b41922d0f8ffc0d1a63d8c59d2
-size 356193
+oid sha256:a6cd94664f89bdad2a9761ea8b20acb83fed3ed7cb5be41af8fe4852643c0bfc
+size 356175
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en.png
index f67906a37c..9fcf389708 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ffa68c8398d789444151855496e5df4ffa03218a383db6ea46fd4f979829b823
-size 355831
+oid sha256:9daeee1aaa04247da3c8bb5aaae9947aab1ed2d2057995e53d6ebdb63e5cd356
+size 355848
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en.png
index 6e83d6491d..d235670def 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34152c742abc486a48234e22101833bc163cf11979890d06aac41e68e3c404d0
-size 364846
+oid sha256:a00bd766a00b7e7c6615fc53bf469b3ca5056a6c514c096431ae38d99d604306
+size 364845
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en.png
index b10f9741b9..0021619c44 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ec1b0244dab22414c6719b3309426e13128d0c70fb67dc66cd8a60d42521fd0
-size 355411
+oid sha256:7b23d3a37774283067a8919b8c332b1bb5a79e90dceb7216b484b985491282e5
+size 355389
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en.png
index 77abe20982..422c324695 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5c3d87862c6d7fc88d0f23cd54c5b9f77028992fdd7c282a195b964dd17e85ac
-size 367855
+oid sha256:a1df8d22766981fc76d6d767dc3f40d98cadc7c51be20417b067b91af604232b
+size 367884
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en.png
index 1d34761a9b..448bcec677 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7d9b5fc0ff5d7828ad6f4dc0c9bd9520b4920553da97ed7b4e030ee844c0208
-size 353054
+oid sha256:fe0daf9161bc2da194992a2fc9505bf2009c5dbed78cdb35d2eb7ed1380a7df5
+size 353037
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en.png
index 5243218ae3..c081fa16a5 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a85db2f5958db867578663533f204b2e803372d470da890fd8056ffed0cf46c
-size 366254
+oid sha256:6a92bcf5885322e11a706071969fb674b1f6e60e021af153aaa125baa4a602ae
+size 366285
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en.png
index b6d1f07279..47a9a6b630 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4bee12a6bdb18fea5ac6997671bfcb903296da7278cf69b2456330066ca31dfb
-size 342870
+oid sha256:54372845e922d047408dd960d048b9b5eae2263d589117d8e7d197741aa34f32
+size 342827
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en.png
index ceca184bd7..5560c21967 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e82011a72f36889c53ab61ed2b9947c7fb5f868c9b7010904fc10f4ca587082
-size 356082
+oid sha256:af4a48ee80535f2c0a226c4ffa4344054fb63b7b0a88ea2c030a4eb8dd5e9644
+size 356078
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en.png
index 5cdad1df92..5cc5cfe4fc 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e2d8caf5aaae7d3406c703288e491f328552f0acd18e56afd5265b4ceaf1cd1
-size 355272
+oid sha256:6524cc87257cc9d3f135904f4e14594b56df695e71fe576418d2319c472d710b
+size 355285
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en.png
index a431a9429a..e9d85990e8 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93c2df04d65f6078ce3f7067fbae8a7317ec42ed0fc013dee962a3953269f3b7
-size 362813
+oid sha256:66d4b6ea4a697735bbb0fac936b89cde99c5077973ba828894bf50b5dae233b3
+size 362848
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en.png
index 0eb106f4a9..b51a89586b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:217ac95bf476c53d2dc6d3d0143b21312bf38b8ab86c8dfd4f9360582b584f9d
-size 395476
+oid sha256:e642229c58169775fe702769a306bbef22698516ae6f7ac75a761213c3f195fa
+size 395446
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en.png
index ae8495618a..aa322fc2e4 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08057fdc1e1184720b438ddd2a8753f00791baf2456cc30b45de8e6bdeb57e8e
-size 354404
+oid sha256:5fae87094ea13b14e2dc7c16ca96e4f8096ff39e962799468fb4ead4c666620f
+size 354381
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en.png
index 9d617f6688..40105c1498 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dabad9dcd5b8f0d4bb964a0187ad7c94b023b04552dacd29a077daddfd48d550
-size 354052
+oid sha256:5ed24d190f10c079f8cf176404372d40eb25cc78ce595a22febc540315057b86
+size 354075
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en.png
index 1a8ea3e4e9..0cfd1dc985 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66aba7b4271a990fac85b0bbc7cbdc371fa1e38a4da5bb4e2f62a80b21cb3a8f
-size 363012
+oid sha256:545c9e8933e420cc3f8fbba0fbd5162c946c65a20721faeb77c568596ca720cd
+size 363045
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en.png
index c8306263a0..c9227ebf94 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:756f0cff90ddd61adce2f467c0384d74d430f6d51c091e4980e45bcc9ee6f0fd
-size 353705
+oid sha256:e614f4a8657637c584a283d69124236d00fe1251c2b8d739c5688a57a6fd152e
+size 353693
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_12_en.png
index 0a41aba67c..b2e29b6c25 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9427e90f0865c7427006a73af5b64a799dee8ef9873994b44471e3494d156afb
-size 53265
+oid sha256:b68f247755ed20b6c597099c377d87ce57ad6131f57a641223c248ea04f8f1a6
+size 52141
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_0_en.png
index 89fc6708d2..cfa6e4dbc3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89467c5b84d0a15210d4013013598d9994d3005a2299e44583d78355e6718ad8
-size 55538
+oid sha256:7a3281f35461edb900ea434c68543dc684a5fad7dab7c9aabac510bc59d442b3
+size 56479
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_10_en.png
index 17df34a50a..5f3a619097 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6548f5bf1906e1dddcbcc03bb8f76b42e604075751ea8efbc3ead826bf4cfad7
-size 51258
+oid sha256:19d14e3d779b163053c28e66d3381f0cabe3b540744606e955cd733f9e044089
+size 51713
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_12_en.png
index 350c877e8a..b46bcd0a0e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d910cdbd02c49ef5decf23e3a804d15be047522f6260505bc696b856379891a
-size 47310
+oid sha256:7e3e355c5d274b11f973d624ee3c3a275bf7d6c45f390fef3228b2e32de91e35
+size 48480
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_2_en.png
index f425dd2c4c..f4ab74029b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd6dc088e16f722b36c2198d6a8611af87dec2451f94ca3c2b6880b97f709b98
-size 54095
+oid sha256:51a5b682243b969bc2d7d609decb823b0509d240f3ff14ee78319260af76a47f
+size 58740
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_4_en.png
index 486d5da5c6..0ad1e67deb 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e482603e6d03fffb57d4eb135edb6209c748c51b1f07e638a4ccf133b1b87a79
-size 52920
+oid sha256:82e6e38576a507b19e58fce9dda0734ec00bcedcb0baf8f4c7919dbaaf7d2b85
+size 55046
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png
index 0383bb8f95..f82a7a8219 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c88b3ed8cc69dee59d4d0a726a9e383d00f2815b6525315f7dcd96f9c25ec2a
-size 45618
+oid sha256:22ea7fe121a63b35a2c2bb47609e692f8bf2b913871a6baf3d420c04334c6c4a
+size 44344
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_8_en.png
index 0f7fe2db38..cfa62a6626 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a576d52b840730334a38046cf8b57993693fc760b4fbdc00376cb48b7268d76e
-size 55890
+oid sha256:bfe848e4c365cf4b4d663145f74e5f8b3f47a4c8994961c530603f0248400316
+size 57117
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en.png
index 074820e157..7cca911c45 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7caacb336793b8ae4b83e9a10a82325e25e8b3c036f881898ed28688250eb6e0
-size 55744
+oid sha256:26e14b77fa3c3aeaea58782309e6de8b9047e07945009322990ebf5f4c283309
+size 52770
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en.png
index 7cca911c45..2af459c158 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26e14b77fa3c3aeaea58782309e6de8b9047e07945009322990ebf5f4c283309
-size 52770
+oid sha256:28a95d4b7ebca92c4e0467f3ecd9acdaf7f6257604d190f5d088a9a25e87d637
+size 55305
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en.png
index a68f886f73..616c06bf46 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5a2e306087a967849f61872b56a83f194d1a76df5723f0bbae6e6e2f4a98c63
-size 55725
+oid sha256:0ce2519906f1aaf34700ca9ba4bdeaa72030f1f5aff3f7e24352a1435ac67d98
+size 53966
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en.png
index 36d19c6b72..616c06bf46 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7dfa2767c55a81d3f121b8fa55443b7b05f9369e91639b80e0be349863799ad7
-size 55438
+oid sha256:0ce2519906f1aaf34700ca9ba4bdeaa72030f1f5aff3f7e24352a1435ac67d98
+size 53966
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_5_en.png
index 2c15fd6a37..82f344f714 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7260abe16fc2ab4f6ada97ea0f756dc5c9908ff3b61d6ec1723ffde302bb3dc5
-size 11955
+oid sha256:8d96eefa01a5de803b0cc9d9109c20df86eaff01b73ff24a91945b43d53d5d01
+size 11960
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_6_en.png
index 7c422591ad..fdd8fcd5a5 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e16fc1daa0f284c442f66591e1d1f59161272a67998d26740b0b403bfe82495
-size 11866
+oid sha256:22678a2a8505e1d9d5bfcb44459b6fac69c11a4bf72fae09c48ffa2e54f5a110
+size 12128
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_5_en.png
index acb8afa74a..f6e27475da 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bed7565420e11c43acc06896ef298683d2f2dd1dc16c430eab7018e9ead9937a
-size 11652
+oid sha256:9ee89826c8aa2ac0371ed31959243f62bf9968806a7b27117cd7b4d849423a33
+size 11667
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_6_en.png
index e0a4cb1c97..b1bb69efb8 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87811df502c760816e74beb006341627857c39380ce715f1a747ac9fce77b226
-size 11516
+oid sha256:e27cb9e501ccbac54926f0252b4098867643a2d2683c5b267f86ad99edf6f5d7
+size 11817
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en.png
index 5c597300e4..73b8b8e50c 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21aee17ee9a292bb2f0d3d2ec2db565ebb8d5df753454a5a002f033ed5ed39c5
-size 3853
+oid sha256:e8a3ad99763929d2783147814e44fa9ec7e7efb7b99949e3580f23c38fb5d971
+size 9398
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en.png
index f8a1f24b34..5c597300e4 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1342b6427f5b2e3075ae3ccee60bf1d3b11afaccf3e152643d6ef2d65c21b54e
-size 9108
+oid sha256:21aee17ee9a292bb2f0d3d2ec2db565ebb8d5df753454a5a002f033ed5ed39c5
+size 3853
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en.png
index 4ae7279fe7..d47bf90664 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:410a8596d4c70b9a3856d959d6d71ade8e831e8581ff410c9900957a93b3eb50
-size 8114
+oid sha256:520cae2544153ba45f8fe4b021286c2d22da06aa1b60be7f1b13879723ff994c
+size 3664
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en.png
index d47bf90664..a87d89c701 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:520cae2544153ba45f8fe4b021286c2d22da06aa1b60be7f1b13879723ff994c
-size 3664
+oid sha256:0f3a0cb5d9bae6725a1c527f3d9575aabf85d3edf63a28d9faa23f4f0b65e2d0
+size 7624
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png
index 58546b8522..ee5c582240 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30357bf18792db5ab20085010251170a724ffe8c00313facd04ee704e806af64
-size 10982
+oid sha256:75de341f705bb22955f9399180519b65ad59c2e1917317d56e50ea4db78f35bc
+size 12102
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en.png
index fedead0fa8..52fd9b9693 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4811667dec0f32accc5e2c8a5dd5c0b34017fcff8d1e0376ee7a4708426bca0f
-size 9838
+oid sha256:58b9491aaa5554b89d86c62a5c9c44975367538c6baa5562f8dc5768f76d8264
+size 8705
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en.png
index 83302d6ba4..38ad0e4b56 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16dee1dfe746cd40dac9fe8f0af3ecb42cd14bab5cc490917b589beed065ed1b
-size 14686
+oid sha256:326d59cf768b2dbd96eb7964d54c8eda509a5cd57c6e62087625e3314da0bb4d
+size 13658
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png
index 4da2a98aca..687e0d436a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef0dc4d53daeb986f378b6e4d85928b4b6729336c89cf21e642c88c53688a3ab
-size 10292
+oid sha256:d57df7110371c9224e232b707d6a1b10ce14afcb56c803a78220792f2a0d4cf2
+size 11354

From 51fe66cd884ea1e239f11d81d82da62616344e34 Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Tue, 22 Sep 2026 15:29:20 +0200
Subject: [PATCH 11/20] Add linkification to the new timeline renderer (#7731)

* Add linkification to the new timeline renderer

Reuse `AnnotatedString.linkify` for now, even though it creates `Spannable` instances for that: it's the closest one to what we already had.

Also, make sure we use the same URL annotation identifier in the renderer and the linkificator.

* Update screenshots

---------

Co-authored-by: ElementBot <android@element.io>
---
 .../components/ClickableLinkText.kt           |  8 ++++---
 .../htmlrenderer/api/HtmlMessageParser.kt     |  3 ++-
 .../htmlrenderer/api/ui/HtmlMessageContent.kt | 13 ++++++++--
 .../api/ui/HtmlMessageContentPreview.kt       | 24 +++++++++++++++++++
 ...er.api.ui_HtmlMessageContent_Day_11_en.png |  3 +++
 ....api.ui_HtmlMessageContent_Night_11_en.png |  3 +++
 6 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_11_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_11_en.png

diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt
index a70aafff36..f2b2a47f16 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt
@@ -32,8 +32,8 @@ import androidx.compose.ui.text.TextLayoutResult
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.core.text.util.LinkifyCompat
 import io.element.android.compound.theme.LinkColor
+import io.element.android.libraries.androidutils.text.LinkifyHelper
 import io.element.android.libraries.designsystem.preview.ElementThemedPreview
 import io.element.android.libraries.designsystem.preview.PreviewGroup
 import io.element.android.libraries.designsystem.theme.components.Text
@@ -142,7 +142,7 @@ fun ClickableLinkText(
 fun AnnotatedString.linkify(linkStyle: SpanStyle): AnnotatedString {
     val original = this
     val spannable = SpannableString.valueOf(this.text)
-    LinkifyCompat.addLinks(spannable, Linkify.WEB_URLS or Linkify.PHONE_NUMBERS or Linkify.EMAIL_ADDRESSES)
+    LinkifyHelper.linkify(spannable, Linkify.WEB_URLS or Linkify.PHONE_NUMBERS or Linkify.EMAIL_ADDRESSES)
 
     val spans = spannable.getSpans(0, spannable.length, URLSpan::class.java)
     return buildAnnotatedString {
@@ -150,7 +150,9 @@ fun AnnotatedString.linkify(linkStyle: SpanStyle): AnnotatedString {
         for (span in spans) {
             val start = spannable.getSpanStart(span)
             val end = spannable.getSpanEnd(span)
-            if (original.getLinkAnnotations(start, end).isEmpty() && original.getStringAnnotations("URL", start, end).isEmpty()) {
+            if (original.getLinkAnnotations(start, end).isEmpty() &&
+                original.getStringAnnotations(LINK_TAG, start, end).isEmpty() &&
+                original.getStringAnnotations("inline_code", start, end).isEmpty()) {
                 // Prevent linkifying domains in user or room handles (@user:domain.com, #room:domain.com)
                 if (start > 0 && !spannable[start - 1].isWhitespace()) continue
 
diff --git a/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/HtmlMessageParser.kt b/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/HtmlMessageParser.kt
index f0c3f67249..95343313db 100644
--- a/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/HtmlMessageParser.kt
+++ b/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/HtmlMessageParser.kt
@@ -7,6 +7,7 @@
 
 package io.element.android.libraries.htmlrenderer.api
 
+import io.element.android.libraries.designsystem.components.LINK_TAG
 import org.jsoup.nodes.Document
 
 /**
@@ -28,7 +29,7 @@ interface HtmlMessageParser {
          * Tag used for the string annotation attached to link (`<a href>`) text ranges in a
          * [ParagraphNode.text]. The annotation value is the link target URL.
          */
-        const val LINK_ANNOTATION_TAG = "url"
+        const val LINK_ANNOTATION_TAG = LINK_TAG
 
         /**
          * Tag used for the string annotation attached to inline code (`<code>`) text ranges in a
diff --git a/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/ui/HtmlMessageContent.kt b/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/ui/HtmlMessageContent.kt
index 25b1f95338..ecb13310be 100644
--- a/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/ui/HtmlMessageContent.kt
+++ b/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/ui/HtmlMessageContent.kt
@@ -70,6 +70,7 @@ import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.libraries.designsystem.components.linkify
 import io.element.android.libraries.designsystem.text.toPx
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.htmlrenderer.api.BlockNode
@@ -204,7 +205,9 @@ private fun ParagraphView(
     val codeBackgroundColor = ElementTheme.colors.bgSubtleSecondary
     val codeBorderColor = ElementTheme.colors.borderInteractiveSecondary
     val styledText = remember(node.text, linkColor) {
-        node.text.applyLinkStyles(linkColor = linkColor)
+        node.text
+            .linkify(SpanStyle(color = linkColor))
+            .applyLinkStyles(linkColor = linkColor)
     }
     val inlineContent = rememberMentionInlineContent(node.inlineContent, context)
     val layoutResult = remember { mutableStateOf<TextLayoutResult?>(null) }
@@ -411,7 +414,13 @@ private fun AnnotatedString.applyLinkStyles(linkColor: Color): AnnotatedString {
     if (linkRanges.isEmpty()) return this
     return buildAnnotatedString {
         append(this@applyLinkStyles)
-        linkRanges.forEach { addStyle(SpanStyle(color = linkColor), it.start, it.end) }
+        linkRanges.forEach { linkRange ->
+            val containsColorSpan =
+                spanStyles.any { colorRange -> colorRange.start == linkRange.start && colorRange.end == linkRange.end && colorRange.item.color == linkColor }
+            if (!containsColorSpan) {
+                addStyle(SpanStyle(color = linkColor), linkRange.start, linkRange.end)
+            }
+        }
     }
 }
 
diff --git a/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/ui/HtmlMessageContentPreview.kt b/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/ui/HtmlMessageContentPreview.kt
index 117764f02d..47da9af3bb 100644
--- a/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/ui/HtmlMessageContentPreview.kt
+++ b/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/ui/HtmlMessageContentPreview.kt
@@ -16,6 +16,7 @@ import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.withAnnotation
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
@@ -65,6 +66,7 @@ internal class HtmlMessageContentPreviewParam : PreviewParameterProvider<Documen
             mentionOwn(),
             nestedList(),
             nestedListWithComplexContents(),
+            linkifiedParagraph(),
         )
 
     private fun richParagraph() = document(
@@ -82,6 +84,28 @@ internal class HtmlMessageContentPreviewParam : PreviewParameterProvider<Documen
         ),
     )
 
+    private fun linkifiedParagraph() = document(
+        paragraph(
+            buildAnnotatedString {
+                append("Hello me@matrix.org, check out element.io and and call +1 234 567 8900, then get in touch with ")
+                appendInlineContent(MENTION_ID, "@alice:example.org")
+                append(".\n\n")
+                append("Also, ignore this link: ")
+                val start = length
+                append("https://matrix.org")
+                addStringAnnotation(LINK_ANNOTATION_TAG, "https://matrix.org", start, length)
+                append(" and this one: ")
+                withAnnotation(INLINE_CODE_ANNOTATION_TAG, "") {
+                    append("https://element.io")
+                }
+                append(".")
+            },
+            inlineContent = persistentMapOf(
+                MENTION_ID to MentionNodeContent.User(displayText = "@alice", userId = UserId("@alice:example.org")),
+            ),
+        ),
+    )
+
     private fun inlineCode() = document(
         paragraph(
             buildAnnotatedString {
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_11_en.png
new file mode 100644
index 0000000000..36fea9517e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_11_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9cf8a07aeadd7d54bcdf3304d0bf1efe0a00c1964c02b0a24cd6d7718cc51d4b
+size 31085
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_11_en.png
new file mode 100644
index 0000000000..7cc90da21f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_11_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb4918eba234005d307ff24540bc837d4e3f06db06eee6e841e5c2af6cae1063
+size 30378

From 8b1b5560d9bffa534b2e82f6fc1fce07b34c5286 Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Tue, 22 Sep 2026 17:17:57 +0200
Subject: [PATCH 12/20] Add recent search results to global search (#7742)

* Add global search results history: keep the latest 25 items used in the global search, save them to an encrypted file store.

* Integrate the search history in the global search feature

* Add `MatrixClient.getRoomInfo` and use it in `GlobalSearchPresenter`

---------

Co-authored-by: ElementBot <android@element.io>
---
 features/home/impl/build.gradle.kts           |   3 +
 .../home/impl/search/GlobalSearchEvent.kt     |  18 ++
 .../home/impl/search/GlobalSearchPresenter.kt |  51 +++-
 .../home/impl/search/GlobalSearchState.kt     |  15 +
 .../search/GlobalSearchStatePreviewParam.kt   | 178 +++++++----
 .../home/impl/search/GlobalSearchView.kt      | 282 +++++++++++++-----
 .../history/DefaultSearchHistoryFileStore.kt  |  47 +++
 .../history/DefaultSearchHistoryStore.kt      |  96 ++++++
 .../search/history/SearchHistoryFileStore.kt  |  34 +++
 .../search/history/SearchHistoryResult.kt     |  26 ++
 .../impl/search/history/SearchHistoryStore.kt |  42 +++
 .../impl/src/main/res/values/temporary.xml    |   1 +
 .../impl/search/GlobalSearchPresenterTest.kt  | 100 ++++++-
 .../home/impl/search/GlobalSearchViewTest.kt  | 275 +++++++++++++++++
 .../history/DefaultSearchHistoryStoreTest.kt  | 121 ++++++++
 .../history/FakeSearchHistoryFileStore.kt     |  33 ++
 .../search/history/FakeSearchHistoryStore.kt  |  28 ++
 .../SearchHistoryResultSerializationTest.kt   |  50 ++++
 .../encrypteddb/crypto/EncryptedFile.kt       |   2 +-
 .../libraries/matrix/api/MatrixClient.kt      |   5 +
 .../libraries/matrix/api/core/RoomId.kt       |   1 +
 .../libraries/matrix/impl/RustMatrixClient.kt |   8 +
 .../libraries/matrix/test/FakeMatrixClient.kt |   4 +
 ....impl.search_GlobalSearchView_Day_1_en.png |   4 +-
 ....impl.search_GlobalSearchView_Day_2_en.png |   4 +-
 ....impl.search_GlobalSearchView_Day_3_en.png |   4 +-
 ....impl.search_GlobalSearchView_Day_4_en.png |   4 +-
 ....impl.search_GlobalSearchView_Day_5_en.png |   4 +-
 ....impl.search_GlobalSearchView_Day_6_en.png |   3 +
 ...mpl.search_GlobalSearchView_Night_1_en.png |   4 +-
 ...mpl.search_GlobalSearchView_Night_2_en.png |   4 +-
 ...mpl.search_GlobalSearchView_Night_3_en.png |   4 +-
 ...mpl.search_GlobalSearchView_Night_4_en.png |   4 +-
 ...mpl.search_GlobalSearchView_Night_5_en.png |   4 +-
 ...mpl.search_GlobalSearchView_Night_6_en.png |   3 +
 ...anner_KnockRequestsBannerView_Day_5_en.png |   4 +-
 ...ner_KnockRequestsBannerView_Night_5_en.png |   4 +-
 ...pl.list_KnockRequestsListView_Day_3_en.png |   4 +-
 ....list_KnockRequestsListView_Night_3_en.png |   4 +-
 ...screens.qrcode_ShowQrCodeView_Day_0_en.png |   4 +-
 ...reens.qrcode_ShowQrCodeView_Night_0_en.png |   4 +-
 ....impl.share_ShareLocationView_Day_0_en.png |   4 +-
 ....impl.share_ShareLocationView_Day_1_en.png |   4 +-
 ....impl.share_ShareLocationView_Day_2_en.png |   4 +-
 ....impl.share_ShareLocationView_Day_3_en.png |   4 +-
 ....impl.share_ShareLocationView_Day_4_en.png |   4 +-
 ....impl.share_ShareLocationView_Day_5_en.png |   4 +-
 ....impl.share_ShareLocationView_Day_6_en.png |   4 +-
 ....impl.share_ShareLocationView_Day_7_en.png |   4 +-
 ....impl.share_ShareLocationView_Day_8_en.png |   4 +-
 ....impl.share_ShareLocationView_Day_9_en.png |   4 +-
 ...mpl.share_ShareLocationView_Night_0_en.png |   4 +-
 ...mpl.share_ShareLocationView_Night_1_en.png |   4 +-
 ...mpl.share_ShareLocationView_Night_2_en.png |   4 +-
 ...mpl.share_ShareLocationView_Night_3_en.png |   4 +-
 ...mpl.share_ShareLocationView_Night_4_en.png |   4 +-
 ...mpl.share_ShareLocationView_Night_5_en.png |   4 +-
 ...mpl.share_ShareLocationView_Night_6_en.png |   4 +-
 ...mpl.share_ShareLocationView_Night_7_en.png |   4 +-
 ...mpl.share_ShareLocationView_Night_8_en.png |   4 +-
 ...mpl.share_ShareLocationView_Night_9_en.png |   4 +-
 ....components_PinEntryTextField_Day_0_en.png |   4 +-
 ...omponents_PinEntryTextField_Night_0_en.png |   4 +-
 ...eeditor_AttachmentImageEditorView_2_en.png |   4 +-
 ...eeditor_AttachmentImageEditorView_5_en.png |   4 +-
 ...essagesViewWithIdentityChange_Day_0_en.png |   4 +-
 ...essagesViewWithIdentityChange_Day_1_en.png |   4 +-
 ...essagesViewWithIdentityChange_Day_2_en.png |   4 +-
 ...sagesViewWithIdentityChange_Night_0_en.png |   4 +-
 ...sagesViewWithIdentityChange_Night_1_en.png |   4 +-
 ...sagesViewWithIdentityChange_Night_2_en.png |   4 +-
 ...veVerifiedUserSendFailureView_Day_1_en.png |   4 +-
 ...veVerifiedUserSendFailureView_Day_2_en.png |   4 +-
 ...VerifiedUserSendFailureView_Night_1_en.png |   4 +-
 ...VerifiedUserSendFailureView_Night_2_en.png |   4 +-
 ...s.event_ATimelineItemEventRow_Day_0_en.png |   4 +-
 ...event_ATimelineItemEventRow_Night_0_en.png |   4 +-
 ...lineItemEventRowDisambiguated_Day_0_en.png |   4 +-
 ...neItemEventRowDisambiguated_Night_0_en.png |   4 +-
 ...mEventRowWithReplyInformative_Day_0_en.png |   4 +-
 ...mEventRowWithReplyInformative_Day_1_en.png |   4 +-
 ...ventRowWithReplyInformative_Night_0_en.png |   4 +-
 ...ventRowWithReplyInformative_Night_1_en.png |   4 +-
 ...ineItemEventRowWithReplyOther_Day_0_en.png |   4 +-
 ...ineItemEventRowWithReplyOther_Day_1_en.png |   4 +-
 ...eItemEventRowWithReplyOther_Night_0_en.png |   4 +-
 ...eItemEventRowWithReplyOther_Night_1_en.png |   4 +-
 ...TimelineItemEventRowWithReply_Day_0_en.png |   4 +-
 ...imelineItemEventRowWithReply_Day_10_en.png |   4 +-
 ...imelineItemEventRowWithReply_Day_11_en.png |   4 +-
 ...TimelineItemEventRowWithReply_Day_1_en.png |   4 +-
 ...TimelineItemEventRowWithReply_Day_2_en.png |   4 +-
 ...TimelineItemEventRowWithReply_Day_3_en.png |   4 +-
 ...TimelineItemEventRowWithReply_Day_4_en.png |   4 +-
 ...TimelineItemEventRowWithReply_Day_5_en.png |   4 +-
 ...TimelineItemEventRowWithReply_Day_6_en.png |   4 +-
 ...TimelineItemEventRowWithReply_Day_7_en.png |   4 +-
 ...TimelineItemEventRowWithReply_Day_8_en.png |   4 +-
 ...TimelineItemEventRowWithReply_Day_9_en.png |   4 +-
 ...melineItemEventRowWithReply_Night_0_en.png |   4 +-
 ...elineItemEventRowWithReply_Night_10_en.png |   4 +-
 ...elineItemEventRowWithReply_Night_11_en.png |   4 +-
 ...melineItemEventRowWithReply_Night_1_en.png |   4 +-
 ...melineItemEventRowWithReply_Night_2_en.png |   4 +-
 ...melineItemEventRowWithReply_Night_3_en.png |   4 +-
 ...melineItemEventRowWithReply_Night_4_en.png |   4 +-
 ...melineItemEventRowWithReply_Night_5_en.png |   4 +-
 ...melineItemEventRowWithReply_Night_6_en.png |   4 +-
 ...melineItemEventRowWithReply_Night_7_en.png |   4 +-
 ...melineItemEventRowWithReply_Night_8_en.png |   4 +-
 ...melineItemEventRowWithReply_Night_9_en.png |   4 +-
 ...es.messages.impl_MessagesView_Day_0_en.png |   4 +-
 ...s.messages.impl_MessagesView_Day_10_en.png |   4 +-
 ...s.messages.impl_MessagesView_Day_11_en.png |   4 +-
 ...s.messages.impl_MessagesView_Day_12_en.png |   4 +-
 ...es.messages.impl_MessagesView_Day_1_en.png |   4 +-
 ...es.messages.impl_MessagesView_Day_2_en.png |   4 +-
 ...es.messages.impl_MessagesView_Day_3_en.png |   4 +-
 ...es.messages.impl_MessagesView_Day_4_en.png |   4 +-
 ...es.messages.impl_MessagesView_Day_5_en.png |   4 +-
 ...es.messages.impl_MessagesView_Day_6_en.png |   4 +-
 ...es.messages.impl_MessagesView_Day_7_en.png |   4 +-
 ...es.messages.impl_MessagesView_Day_8_en.png |   4 +-
 ...es.messages.impl_MessagesView_Day_9_en.png |   4 +-
 ....messages.impl_MessagesView_Night_0_en.png |   4 +-
 ...messages.impl_MessagesView_Night_10_en.png |   4 +-
 ...messages.impl_MessagesView_Night_11_en.png |   4 +-
 ...messages.impl_MessagesView_Night_12_en.png |   4 +-
 ....messages.impl_MessagesView_Night_1_en.png |   4 +-
 ....messages.impl_MessagesView_Night_2_en.png |   4 +-
 ....messages.impl_MessagesView_Night_3_en.png |   4 +-
 ....messages.impl_MessagesView_Night_4_en.png |   4 +-
 ....messages.impl_MessagesView_Night_5_en.png |   4 +-
 ....messages.impl_MessagesView_Night_6_en.png |   4 +-
 ....messages.impl_MessagesView_Night_7_en.png |   4 +-
 ....messages.impl_MessagesView_Night_8_en.png |   4 +-
 ....messages.impl_MessagesView_Night_9_en.png |   4 +-
 ...blockedusers_BlockedUsersView_Day_4_en.png |   4 +-
 ...blockedusers_BlockedUsersView_Day_5_en.png |   4 +-
 ...ockedusers_BlockedUsersView_Night_4_en.png |   4 +-
 ...ockedusers_BlockedUsersView_Night_5_en.png |   4 +-
 ...mpl.userstatus_UserStatusView_Day_5_en.png |   4 +-
 ...mpl.userstatus_UserStatusView_Day_6_en.png |   4 +-
 ...l.userstatus_UserStatusView_Night_5_en.png |   4 +-
 ...l.userstatus_UserStatusView_Night_6_en.png |   4 +-
 ...impl_RoomMemberModerationView_Day_5_en.png |   4 +-
 ...impl_RoomMemberModerationView_Day_7_en.png |   4 +-
 ...pl_RoomMemberModerationView_Night_5_en.png |   4 +-
 ...pl_RoomMemberModerationView_Night_7_en.png |   4 +-
 ...orizontalFloatingToolbarNoFab_Day_0_en.png |   4 +-
 ...izontalFloatingToolbarNoFab_Night_0_en.png |   4 +-
 ...nts_HorizontalFloatingToolbar_Day_0_en.png |   4 +-
 ...s_HorizontalFloatingToolbar_Night_0_en.png |   4 +-
 153 files changed, 1537 insertions(+), 401 deletions(-)
 create mode 100644 features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/DefaultSearchHistoryFileStore.kt
 create mode 100644 features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/DefaultSearchHistoryStore.kt
 create mode 100644 features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/SearchHistoryFileStore.kt
 create mode 100644 features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/SearchHistoryResult.kt
 create mode 100644 features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/SearchHistoryStore.kt
 create mode 100644 features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/GlobalSearchViewTest.kt
 create mode 100644 features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/history/DefaultSearchHistoryStoreTest.kt
 create mode 100644 features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/history/FakeSearchHistoryFileStore.kt
 create mode 100644 features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/history/FakeSearchHistoryStore.kt
 create mode 100644 features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/history/SearchHistoryResultSerializationTest.kt
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_6_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_6_en.png

diff --git a/features/home/impl/build.gradle.kts b/features/home/impl/build.gradle.kts
index efdc545e61..42440934dd 100644
--- a/features/home/impl/build.gradle.kts
+++ b/features/home/impl/build.gradle.kts
@@ -12,6 +12,7 @@ import extension.testCommonDependencies
 plugins {
     id("io.element.android-compose-library")
     id("kotlin-parcelize")
+    alias(libs.plugins.kotlin.serialization)
 }
 
 android {
@@ -31,6 +32,8 @@ dependencies {
     implementation(projects.libraries.core)
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.architecture)
+    implementation(projects.libraries.encryptedDb)
+    implementation(libs.serialization.json)
     implementation(projects.libraries.featureflag.api)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrixui)
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchEvent.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchEvent.kt
index 5f8093b1de..1e051bd807 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchEvent.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchEvent.kt
@@ -7,9 +7,27 @@
 
 package io.element.android.features.home.impl.search
 
+import io.element.android.libraries.matrix.api.core.RoomId
+
 sealed interface GlobalSearchEvent {
+    /** The user cleared the search query. */
     object ClearQuery : GlobalSearchEvent
+
+    /** The search screen visibility changed (e.g. the user opened or closed the search screen). */
     object ToggleSearchVisibility : GlobalSearchEvent
+
+    /** The visible range for the displayed search results changed. */
     data class UpdateVisibleRange(val range: IntRange) : GlobalSearchEvent
+
+    /** The user changed the search target (e.g. from "Rooms" to "Messages"). */
     data class UpdateTarget(val target: GlobalSearchTarget) : GlobalSearchEvent
+
+    /** The user triggered the keyboard search action (enter key): save the current query to the search history. */
+    object SaveQueryToHistory : GlobalSearchEvent
+
+    /** The user opened a room from the search results: save it to the search history. */
+    data class SaveRoomToHistory(val roomId: RoomId) : GlobalSearchEvent
+
+    /** The user selected a search result from the search history. */
+    data class SearchHistoryResultSelected(val resultItem: SearchHistoryResultItem) : GlobalSearchEvent
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchPresenter.kt
index fe7c4aba3e..7b8b21be38 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchPresenter.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchPresenter.kt
@@ -18,6 +18,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Inject
+import io.element.android.features.home.impl.search.history.SearchHistoryResult
+import io.element.android.features.home.impl.search.history.SearchHistoryStore
 import io.element.android.libraries.androidutils.filesize.FileSizeFormatter
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
@@ -47,6 +49,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.VoiceMessageT
 import io.element.android.libraries.matrix.api.timeline.item.event.isMediaContent
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailType
 import io.element.android.libraries.matrix.ui.messages.toPlainText
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.async
@@ -54,10 +57,8 @@ import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import kotlin.jvm.optionals.getOrElse
 import kotlin.time.Duration.Companion.milliseconds
 
 @Inject
@@ -71,6 +72,7 @@ class GlobalSearchPresenter(
     private val permalinkParser: PermalinkParser,
     private val coroutineDispatchers: CoroutineDispatchers,
     private val matrixClient: MatrixClient,
+    private val searchHistoryStore: SearchHistoryStore,
 ) : Presenter<GlobalSearchState> {
     @Composable
     override fun present(): GlobalSearchState {
@@ -85,6 +87,21 @@ class GlobalSearchPresenter(
         var currentTarget: GlobalSearchTarget by remember { mutableStateOf(GlobalSearchTarget.ROOMS) }
         val currentMessageSearch: MessageSearch = remember { messageSearchService.createMessageSearch(scope = coroutineScope) }
 
+        val searchHistory by produceState<AsyncData<ImmutableList<SearchHistoryResultItem>>>(initialValue = AsyncData.Uninitialized) {
+            searchHistoryStore.history.collectLatest { history ->
+                val mappedHistoryItems = history.mapNotNull { result ->
+                    when (result) {
+                        is SearchHistoryResult.Query -> SearchHistoryResultItem.Query(term = result.term)
+                        is SearchHistoryResult.Room -> {
+                            val roomInfo = matrixClient.getRoomInfo(result.roomId).getOrNull() ?: return@mapNotNull null
+                            SearchHistoryResultItem.Room(roomId = result.roomId, roomInfo = roomInfo)
+                        }
+                    }
+                }
+                value = AsyncData.Success(mappedHistoryItems.toImmutableList())
+            }
+        }
+
         LaunchedEffect(queryState.text) {
             // Add a delay to avoid performing too many searches in a short period of time, which can be expensive
             delay(200.milliseconds)
@@ -141,7 +158,7 @@ class GlobalSearchPresenter(
                         // result, which can be slow if we have a lot of results. The original order is kept by using `awaitAll()`.
                         val mappedResults = results.map { result ->
                             async(coroutineDispatchers.computation) {
-                                val roomInfo = matrixClient.getRoomInfoFlow(result.roomId).first().getOrElse { return@async null }
+                                val roomInfo = matrixClient.getRoomInfo(result.roomId).getOrNull() ?: return@async null
                                 val formattedTimestamp = dateFormatter.format(
                                     timestamp = result.timestamp,
                                     mode = DateFormatterMode.TimeOrDate,
@@ -180,7 +197,8 @@ class GlobalSearchPresenter(
 
         fun handleEvent(event: GlobalSearchEvent) {
             when (event) {
-                GlobalSearchEvent.ClearQuery -> {
+                GlobalSearchEvent.ClearQuery -> coroutineScope.launch {
+                    searchResults = AsyncData.Uninitialized
                     queryState.clearText()
                 }
                 GlobalSearchEvent.ToggleSearchVisibility -> {
@@ -205,6 +223,30 @@ class GlobalSearchPresenter(
                     }
                 }
                 is GlobalSearchEvent.UpdateTarget -> currentTarget = event.target
+                GlobalSearchEvent.SaveQueryToHistory -> {
+                    val term = queryState.text.toString()
+                    if (term.isNotBlank()) {
+                        coroutineScope.launch {
+                            searchHistoryStore.add(SearchHistoryResult.Query(term))
+                        }
+                    }
+                }
+                is GlobalSearchEvent.SaveRoomToHistory -> coroutineScope.launch {
+                    searchHistoryStore.add(SearchHistoryResult.Room(event.roomId))
+                }
+                is GlobalSearchEvent.SearchHistoryResultSelected -> {
+                    when (event.resultItem) {
+                        is SearchHistoryResultItem.Query -> coroutineScope.launch {
+                            delay(300.milliseconds)
+                            queryState.edit {
+                                replace(0, length, event.resultItem.term)
+                            }
+                            searchResults = AsyncData.Loading()
+                            currentTarget = GlobalSearchTarget.ROOMS
+                        }
+                        is SearchHistoryResultItem.Room -> Unit
+                    }
+                }
             }
         }
 
@@ -214,6 +256,7 @@ class GlobalSearchPresenter(
             queryState = queryState,
             currentTarget = currentTarget,
             results = searchResults,
+            history = searchHistory,
             eventSink = ::handleEvent,
         )
     }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchState.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchState.kt
index d623fd5594..44b94bd512 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchState.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchState.kt
@@ -28,6 +28,7 @@ data class GlobalSearchState(
     val queryState: TextFieldState,
     val currentTarget: GlobalSearchTarget,
     val results: AsyncData<GlobalSearchResults>,
+    val history: AsyncData<ImmutableList<SearchHistoryResultItem>>,
     val eventSink: (GlobalSearchEvent) -> Unit
 )
 
@@ -81,6 +82,20 @@ sealed interface MessageSearchResultItem {
     }
 }
 
+sealed interface SearchHistoryResultItem {
+    val id: String
+
+    data class Query(val term: String) : SearchHistoryResultItem {
+        override val id: String = "query:$term"
+    }
+    data class Room(
+        val roomId: RoomId,
+        val roomInfo: RoomInfo,
+    ) : SearchHistoryResultItem {
+        override val id: String = "room:${roomId.value}"
+    }
+}
+
 data class MediaSearchResultContent(
     val filename: String,
     val extension: String?,
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchStatePreviewParam.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchStatePreviewParam.kt
index 73487c5069..f9cc105a77 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchStatePreviewParam.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchStatePreviewParam.kt
@@ -36,77 +36,139 @@ import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageTy
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailType
 import io.element.android.libraries.matrix.ui.messages.reply.aProfileDetailsReady
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toPersistentList
 
+private val tombstonedRoomId = RoomId("!tombstone:server.org")
+private val roomId1 = RoomId("!roomId:server.org")
+private val roomId2 = RoomId("!roomId2:server.org")
+private val dmRoomId = RoomId("!dm:server.org")
+private const val AN_AVATAR_URL = "https://example.com/avatar.png"
+private val aCanonicalAlias = RoomAlias("#alias:server.org")
+
 class GlobalSearchStatePreviewParam : PreviewParameterProvider<GlobalSearchState> {
     override val values: Sequence<GlobalSearchState>
-        get() = sequenceOf(
-            // Not enabled, no preview
-            aGlobalSearchState(isEnabled = false),
-            aGlobalSearchState(isSearchActive = true, queryState = TextFieldState("Query")),
-            aGlobalSearchState(
-                isSearchActive = true,
-                currentTarget = GlobalSearchTarget.ROOMS,
-                queryState = TextFieldState("Query"),
-                results = AsyncData.Loading(),
-            ),
-            aGlobalSearchState(
-                isSearchActive = true,
-                currentTarget = GlobalSearchTarget.ROOMS,
-                queryState = TextFieldState("Query"),
-                results = AsyncData.Success(
-                    GlobalSearchResults.RoomListResults(
-                        results = aRoomListRoomSummaryList().mapIndexed { index, summary ->
-                            summary.copy(name = "Room with Query #${index + 1}")
-                        }.toPersistentList()
+        get() {
+            return sequenceOf(
+                // Not enabled, no preview
+                aGlobalSearchState(isEnabled = false),
+                aGlobalSearchState(isSearchActive = true, queryState = TextFieldState("Query")),
+                aGlobalSearchState(
+                    isSearchActive = true,
+                    currentTarget = GlobalSearchTarget.ROOMS,
+                    queryState = TextFieldState("Query"),
+                    results = AsyncData.Loading(),
+                ),
+                aGlobalSearchState(
+                    isSearchActive = true,
+                    currentTarget = GlobalSearchTarget.ROOMS,
+                    queryState = TextFieldState("Query"),
+                    results = AsyncData.Success(
+                        GlobalSearchResults.RoomListResults(
+                            results = aRoomListRoomSummaryList().mapIndexed { index, summary ->
+                                summary.copy(name = "Room with Query #${index + 1}")
+                            }.toPersistentList()
+                        )
+                    ),
+                ),
+                aGlobalSearchState(
+                    isSearchActive = true,
+                    currentTarget = GlobalSearchTarget.MESSAGES,
+                    queryState = TextFieldState("Query"),
+                    results = AsyncData.Success(GlobalSearchResults.MessageSearchResults(persistentListOf(
+                        MessageSearchResultItem.Message(
+                            messageSearchResult = aMessageSearchResult(eventId = EventId("\$eventId1:server.org")),
+                            body = "A message with Query",
+                            roomInfo = aRoomInfo(),
+                            formattedTimestamp = "12:00",
+                        ),
+                        MessageSearchResultItem.Media(
+                            messageSearchResult = aMessageSearchResult(eventId = EventId("\$eventId2:server.org")),
+                            mediaContent = MediaSearchResultContent(
+                                filename = "file.png",
+                                extension = "PNG",
+                                caption = "A caption containing Query",
+                                formattedSize = "1 MB",
+                                thumbnailSource = MediaSource("https://example.com/thumbnail.png"),
+                                thumbnailType = AttachmentThumbnailType.Image,
+                                blurhash = null,
+                            ),
+                            roomInfo = aRoomInfo(),
+                            formattedTimestamp = "12:00",
+                        ),
+                    ))),
+                ),
+                aGlobalSearchState(
+                    isSearchActive = true,
+                    currentTarget = GlobalSearchTarget.MESSAGES,
+                    queryState = TextFieldState("Query"),
+                    results = AsyncData.Success(GlobalSearchResults.MessageSearchResults(persistentListOf())),
+                ),
+                aGlobalSearchState(
+                    isSearchActive = true,
+                    currentTarget = GlobalSearchTarget.ROOMS,
+                    queryState = TextFieldState(),
+                    results = AsyncData.Uninitialized,
+                    history = AsyncData.Success(
+                        persistentListOf(
+                            SearchHistoryResultItem.Query("Query 1"),
+                            SearchHistoryResultItem.Query("Query 2"),
+                            SearchHistoryResultItem.Room(
+                                roomId = roomId1,
+                                roomInfo = aRoomInfo(
+                                    id = roomId1,
+                                    name = "A room with alias",
+                                    avatarUrl = AN_AVATAR_URL,
+                                    canonicalAlias = aCanonicalAlias,
+                                )
+                            ),
+                            SearchHistoryResultItem.Room(
+                                roomId = roomId2,
+                                roomInfo = aRoomInfo(
+                                    id = roomId2,
+                                    name = "A room",
+                                    avatarUrl = AN_AVATAR_URL,
+                                )
+                            ),
+                            SearchHistoryResultItem.Room(
+                                roomId = dmRoomId,
+                                roomInfo = aRoomInfo(
+                                    id = dmRoomId,
+                                    name = "A DM",
+                                    isDm = true,
+                                    heroes = listOf(MatrixUser(UserId("@user:server.org"), "User", AN_AVATAR_URL)),
+                                    avatarUrl = AN_AVATAR_URL,
+                                    canonicalAlias = aCanonicalAlias,
+                                )
+                            ),
+                            SearchHistoryResultItem.Room(
+                                roomId = tombstonedRoomId,
+                                roomInfo = aRoomInfo(
+                                    id = tombstonedRoomId,
+                                    name = "A tombstoned room",
+                                    avatarUrl = AN_AVATAR_URL,
+                                    successorRoom = SuccessorRoom(
+                                        roomId = RoomId("!successorRoom:server.org"),
+                                        reason = null,
+                                    ),
+                                ),
+                            ),
+                        )
                     )
                 ),
-            ),
-            aGlobalSearchState(
-                isSearchActive = true,
-                currentTarget = GlobalSearchTarget.MESSAGES,
-                queryState = TextFieldState("Query"),
-                results = AsyncData.Success(GlobalSearchResults.MessageSearchResults(persistentListOf(
-                    MessageSearchResultItem.Message(
-                        messageSearchResult = aMessageSearchResult(eventId = EventId("\$eventId1:server.org")),
-                        body = "A message with Query",
-                        roomInfo = aRoomInfo(),
-                        formattedTimestamp = "12:00",
-                    ),
-                    MessageSearchResultItem.Media(
-                        messageSearchResult = aMessageSearchResult(eventId = EventId("\$eventId2:server.org")),
-                        mediaContent = MediaSearchResultContent(
-                            filename = "file.png",
-                            extension = "PNG",
-                            caption = "A caption containing Query",
-                            formattedSize = "1 MB",
-                            thumbnailSource = MediaSource("https://example.com/thumbnail.png"),
-                            thumbnailType = AttachmentThumbnailType.Image,
-                            blurhash = null,
-                        ),
-                        roomInfo = aRoomInfo(),
-                        formattedTimestamp = "12:00",
-                    ),
-                ))),
-            ),
-            aGlobalSearchState(
-                isSearchActive = true,
-                currentTarget = GlobalSearchTarget.MESSAGES,
-                queryState = TextFieldState("Query"),
-                results = AsyncData.Success(GlobalSearchResults.MessageSearchResults(persistentListOf())),
-            ),
-        )
+            )
+        }
 }
 
 fun aRoomInfo(
-    id: RoomId = RoomId("!roomId:server.org"),
+    id: RoomId = roomId1,
     name: String? = "A room",
     rawName: String? = "A room raw name",
     topic: String? = "A room topic",
-    avatarUrl: String? = "https://example.com/avatar.png",
+    avatarUrl: String? = AN_AVATAR_URL,
     isPublic: Boolean = true,
     isDirect: Boolean = false,
     isEncrypted: Boolean = false,
@@ -217,7 +279,7 @@ fun aMessageContent(
 )
 
 internal fun aMessageSearchResult(
-    roomId: RoomId = RoomId("!roomId:server.org"),
+    roomId: RoomId = roomId1,
     eventId: EventId = EventId("\$eventId:server.org"),
     senderId: UserId = UserId("@user:server.org"),
     senderProfile: ProfileDetails = aProfileDetailsReady(),
@@ -238,6 +300,7 @@ internal fun aGlobalSearchState(
     queryState: TextFieldState = TextFieldState(),
     currentTarget: GlobalSearchTarget = GlobalSearchTarget.ROOMS,
     results: AsyncData<GlobalSearchResults> = AsyncData.Uninitialized,
+    history: AsyncData<ImmutableList<SearchHistoryResultItem>> = AsyncData.Uninitialized,
     eventSink: (GlobalSearchEvent) -> Unit = {},
 ) = GlobalSearchState(
     isEnabled = isEnabled,
@@ -245,5 +308,6 @@ internal fun aGlobalSearchState(
     queryState = queryState,
     currentTarget = currentTarget,
     results = results,
+    history = history,
     eventSink = eventSink
 )
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchView.kt
index d5a0460f06..cce0620f3f 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchView.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchView.kt
@@ -23,11 +23,15 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.text.input.KeyboardActionHandler
 import androidx.compose.foundation.text.input.TextFieldLineLimits
-import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.IconButtonDefaults
 import androidx.compose.material3.SingleChoiceSegmentedButtonRow
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
@@ -44,6 +48,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -63,6 +68,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.roundToPx
 import io.element.android.libraries.designsystem.theme.components.FilledTextField
+import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.LinearProgressIndicator
@@ -80,6 +86,7 @@ import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailInfo
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 
 @Composable
@@ -103,7 +110,10 @@ fun GlobalSearchView(
                 onBackButtonClick = {
                     state.eventSink(GlobalSearchEvent.ToggleSearchVisibility)
                 },
-                onSelectSearchResult = onSelectSearchResult,
+                onSelectSearchResult = { roomId, eventId ->
+                    onSelectSearchResult(roomId, eventId)
+                    state.eventSink(GlobalSearchEvent.SaveRoomToHistory(roomId))
+                },
             )
         }
     }
@@ -115,63 +125,11 @@ private fun GlobalSearchContent(
     onBackButtonClick: () -> Unit,
     onSelectSearchResult: (RoomId, EventId?) -> Unit,
 ) {
-    val borderColor = MaterialTheme.colorScheme.tertiary
-    val strokeWidth = 1.dp
-
-    val drawBottomLineModifier = Modifier.drawBehind {
-        drawLine(
-            color = borderColor,
-            start = Offset(0f, size.height),
-            end = Offset(size.width, size.height),
-            strokeWidth = strokeWidth.value
-        )
-    }
-
     Scaffold(
         topBar = {
             TopAppBar(
                 navigationIcon = { BackButton(onClick = onBackButtonClick) },
-                title = {
-                    // The stateSaver will keep the selection state when returning to this UI
-                    val focusRequester = remember { FocusRequester() }
-                    val searchLabel = stringResource(CommonStrings.action_search)
-                    FilledTextField(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .focusRequester(focusRequester)
-                            .semantics { contentDescription = searchLabel },
-                        state = state.queryState,
-                        lineLimits = TextFieldLineLimits.SingleLine,
-                        colors = TextFieldDefaults.colors(
-                            focusedContainerColor = Color.Transparent,
-                            unfocusedContainerColor = Color.Transparent,
-                            disabledContainerColor = Color.Transparent,
-                            focusedIndicatorColor = Color.Transparent,
-                            unfocusedIndicatorColor = Color.Transparent,
-                            disabledIndicatorColor = Color.Transparent,
-                            errorIndicatorColor = Color.Transparent,
-                        ),
-                        trailingIcon = if (state.queryState.text.isNotEmpty()) {
-                            @Composable {
-                                IconButton(onClick = { state.eventSink(GlobalSearchEvent.ClearQuery) }) {
-                                    Icon(
-                                        imageVector = CompoundIcons.Close(),
-                                        contentDescription = stringResource(CommonStrings.a11y_clear_search_field)
-                                    )
-                                }
-                            }
-                        } else {
-                            null
-                        },
-                    )
-
-                    LaunchedEffect(Unit) {
-                        if (!focusRequester.restoreFocusedChild()) {
-                            focusRequester.requestFocus()
-                        }
-                        focusRequester.saveFocusedChild()
-                    }
-                }
+                title = { SearchTopAppBarContent(state = state) }
             )
         },
         contentWindowInsets = scaffoldScrollableContentInsets,
@@ -179,27 +137,9 @@ private fun GlobalSearchContent(
         Column(
             modifier = Modifier.padding(padding),
         ) {
-            SingleChoiceSegmentedButtonRow(
-                modifier = drawBottomLineModifier
-                    .fillMaxWidth()
-                    .padding(start = 16.dp, end = 16.dp, top = 8.dp, bottom = 8.dp)
-            ) {
-                SegmentedButton(
-                    index = 0,
-                    count = 2,
-                    selected = state.currentTarget == GlobalSearchTarget.ROOMS,
-                    onClick = { state.eventSink(GlobalSearchEvent.UpdateTarget(GlobalSearchTarget.ROOMS)) },
-                    text = stringResource(R.string.search_section_chats),
-                )
+            HorizontalDivider(color = ElementTheme.colors.borderInteractivePrimary)
 
-                SegmentedButton(
-                    index = 1,
-                    count = 2,
-                    selected = state.currentTarget == GlobalSearchTarget.MESSAGES,
-                    onClick = { state.eventSink(GlobalSearchEvent.UpdateTarget(GlobalSearchTarget.MESSAGES)) },
-                    text = stringResource(R.string.search_section_messages),
-                )
-            }
+            SearchTargetSelector(state = state)
 
             val lazyListState = rememberLazyListState()
             OnVisibleRangeChangeEffect(lazyListState) { visibleRange ->
@@ -212,9 +152,21 @@ private fun GlobalSearchContent(
                 state = lazyListState,
             ) {
                 val results = state.results.dataOrNull()
+                val historyResults = state.history.dataOrNull()?.toImmutableList() ?: persistentListOf()
                 when {
-                    state.results.isUninitialized() -> startSearching()
-                    state.results.isLoading() -> loading()
+                    state.results.isUninitialized() -> if (state.queryState.text.isBlank() && historyResults.isNotEmpty()) {
+                        searchHistory(historyResults) { result ->
+                            when (result) {
+                                is SearchHistoryResultItem.Query -> Unit
+                                is SearchHistoryResultItem.Room -> onSelectSearchResult(result.roomInfo.id, null)
+                            }
+
+                            state.eventSink(GlobalSearchEvent.SearchHistoryResultSelected(result))
+                        }
+                    } else {
+                        startSearching()
+                    }
+                    state.results.isLoading() -> loadingResults()
                     results?.isEmpty() == true -> emptySearchResults(query = state.queryState.text.toString())
                     results is GlobalSearchResults.RoomListResults -> roomListResults(
                         results = results.results,
@@ -230,6 +182,89 @@ private fun GlobalSearchContent(
     }
 }
 
+@Composable
+private fun SearchTopAppBarContent(state: GlobalSearchState) {
+    // The stateSaver will keep the selection state when returning to this UI
+    val focusRequester = remember { FocusRequester() }
+    val searchLabel = stringResource(CommonStrings.action_search)
+    FilledTextField(
+        modifier = Modifier
+            .fillMaxWidth()
+            .focusRequester(focusRequester)
+            .semantics { contentDescription = searchLabel },
+        state = state.queryState,
+        lineLimits = TextFieldLineLimits.SingleLine,
+        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
+        keyboardActions = KeyboardActionHandler { performDefault ->
+            state.eventSink(GlobalSearchEvent.SaveQueryToHistory)
+            performDefault()
+        },
+        colors = TextFieldDefaults.colors(
+            focusedContainerColor = Color.Transparent,
+            unfocusedContainerColor = Color.Transparent,
+            disabledContainerColor = Color.Transparent,
+            focusedIndicatorColor = Color.Transparent,
+            unfocusedIndicatorColor = Color.Transparent,
+            disabledIndicatorColor = Color.Transparent,
+            errorIndicatorColor = Color.Transparent,
+        ),
+        trailingIcon = if (state.queryState.text.isNotEmpty()) {
+            @Composable {
+                IconButton(
+                    modifier = Modifier.clip(CircleShape).size(20.dp),
+                    onClick = { state.eventSink(GlobalSearchEvent.ClearQuery) },
+                    colors = IconButtonDefaults.iconButtonColors(
+                        containerColor = ElementTheme.colors.borderInteractivePrimary,
+                        contentColor = ElementTheme.colors.iconOnSolidPrimary
+                    )
+                ) {
+                    Icon(
+                        modifier = Modifier.size(16.dp),
+                        imageVector = CompoundIcons.Close(),
+                        contentDescription = stringResource(CommonStrings.a11y_clear_search_field),
+                    )
+                }
+            }
+        } else {
+            null
+        },
+    )
+
+    LaunchedEffect(Unit) {
+        if (!focusRequester.restoreFocusedChild()) {
+            focusRequester.requestFocus()
+        }
+        focusRequester.saveFocusedChild()
+    }
+}
+
+@Composable
+private fun SearchTargetSelector(state: GlobalSearchState) {
+    if (state.queryState.text.isEmpty()) return
+
+    SingleChoiceSegmentedButtonRow(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 8.dp)
+    ) {
+        SegmentedButton(
+            index = 0,
+            count = 2,
+            selected = state.currentTarget == GlobalSearchTarget.ROOMS,
+            onClick = { state.eventSink(GlobalSearchEvent.UpdateTarget(GlobalSearchTarget.ROOMS)) },
+            text = stringResource(R.string.search_section_chats),
+        )
+
+        SegmentedButton(
+            index = 1,
+            count = 2,
+            selected = state.currentTarget == GlobalSearchTarget.MESSAGES,
+            onClick = { state.eventSink(GlobalSearchEvent.UpdateTarget(GlobalSearchTarget.MESSAGES)) },
+            text = stringResource(R.string.search_section_messages),
+        )
+    }
+}
+
 private fun LazyListScope.startSearching() {
     item {
         IconTitleSubtitleMolecule(
@@ -243,7 +278,98 @@ private fun LazyListScope.startSearching() {
     }
 }
 
-private fun LazyListScope.loading() {
+private fun LazyListScope.searchHistory(
+    historyResults: ImmutableList<SearchHistoryResultItem>,
+    onSelectSearchHistoryResult: (SearchHistoryResultItem) -> Unit,
+) {
+    item {
+        Text(
+            modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 8.dp),
+            text = stringResource(R.string.screen_search_recent_searches_section_title),
+            style = ElementTheme.typography.fontBodyLgMedium,
+            color = ElementTheme.colors.textPrimary,
+        )
+    }
+    items(
+        items = historyResults,
+        key = { it.id },
+    ) { result ->
+        Row(
+            modifier = Modifier
+                .niceClickable(onClick = { onSelectSearchHistoryResult(result) })
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp, vertical = 12.dp),
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            when (result) {
+                is SearchHistoryResultItem.Query -> {
+                    Icon(
+                        modifier = Modifier.size(32.dp)
+                            .clip(RoundedCornerShape(8.dp))
+                            .background(ElementTheme.colors.bgSubtleSecondary)
+                            .padding(6.dp),
+                        imageVector = CompoundIcons.History(),
+                        contentDescription = null,
+                        tint = ElementTheme.colors.iconPrimary,
+                    )
+
+                    Text(
+                        text = result.term,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                        style = ElementTheme.typography.fontBodyLgRegular,
+                    )
+                }
+                is SearchHistoryResultItem.Room -> {
+                    val heroAvatars = remember(result.roomInfo.heroes) {
+                        result.roomInfo.heroes.map { it.getAvatarData(AvatarSize.SearchRoomListItem) }.toImmutableList()
+                    }
+                    Avatar(
+                        avatarData = result.roomInfo.getAvatarData(AvatarSize.SearchRoomListItem),
+                        avatarType = AvatarType.Room(
+                            heroes = heroAvatars,
+                            isTombstoned = result.roomInfo.successorRoom != null,
+                        ),
+                    )
+
+                    Column(modifier = Modifier.fillMaxWidth()) {
+                        Text(
+                            text = result.roomInfo.name.orEmpty(),
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                            style = ElementTheme.typography.fontBodyLgRegular,
+                            color = ElementTheme.colors.textPrimary,
+                        )
+
+                        if (result.roomInfo.isDm) {
+                            val dmUserId = result.roomInfo.heroes.firstOrNull()?.userId
+                            dmUserId?.let { userId ->
+                                Text(
+                                    text = userId.value,
+                                    maxLines = 1,
+                                    overflow = TextOverflow.Ellipsis,
+                                    style = ElementTheme.typography.fontBodyMdRegular,
+                                    color = ElementTheme.colors.textSecondary,
+                                )
+                            }
+                        } else if (result.roomInfo.canonicalAlias != null) {
+                            Text(
+                                text = result.roomInfo.canonicalAlias?.value!!,
+                                maxLines = 1,
+                                overflow = TextOverflow.Ellipsis,
+                                style = ElementTheme.typography.fontBodyMdRegular,
+                                color = ElementTheme.colors.textSecondary,
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+private fun LazyListScope.loadingResults() {
     item {
         LinearProgressIndicator(modifier = Modifier.fillMaxWidth())
     }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/DefaultSearchHistoryFileStore.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/DefaultSearchHistoryFileStore.kt
new file mode 100644
index 0000000000..0d7931b2df
--- /dev/null
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/DefaultSearchHistoryFileStore.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.search.history
+
+import android.content.Context
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.di.annotations.ApplicationContext
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.encrypteddb.crypto.EncryptedFile
+import java.io.File
+
+private const val SEARCH_HISTORY_FILE_NAME = "search_history"
+
+/**
+ * Persists the search history in an encrypted file inside the current session file directory, using
+ * [EncryptedFile] (Tink StreamingAead + a master key stored in the Android Keystore).
+ */
+@ContributesBinding(SessionScope::class)
+class DefaultSearchHistoryFileStore(
+    @ApplicationContext private val context: Context,
+    matrixClient: MatrixClient,
+) : SearchHistoryFileStore {
+    private val file: File by lazy {
+        File(matrixClient.sessionPaths.fileDirectory, SEARCH_HISTORY_FILE_NAME)
+    }
+
+    override fun read(): ByteArray? {
+        if (!file.exists()) return null
+        return EncryptedFile(context, file).openFileInput().use { it.readBytes() }
+    }
+
+    override fun write(bytes: ByteArray) {
+        file.parentFile?.takeIf { !it.exists() }?.mkdirs()
+        // Opening a FileOutputStream truncates any previous content, so this overwrites the file.
+        EncryptedFile(context, file).openFileOutput().use { it.write(bytes) }
+    }
+
+    override fun delete(): Boolean {
+        return file.delete()
+    }
+}
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/DefaultSearchHistoryStore.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/DefaultSearchHistoryStore.kt
new file mode 100644
index 0000000000..4da3456043
--- /dev/null
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/DefaultSearchHistoryStore.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.search.history
+
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.androidutils.json.JsonProvider
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.core.extensions.runCatchingExceptions
+import io.element.android.libraries.di.SessionScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+
+@ContributesBinding(SessionScope::class)
+class DefaultSearchHistoryStore(
+    private val fileStore: SearchHistoryFileStore,
+    private val dispatchers: CoroutineDispatchers,
+    private val jsonProvider: JsonProvider,
+) : SearchHistoryStore {
+    private val json by lazy { jsonProvider() }
+
+    // Guards [fileStore] access and the lazy initialization of [cache].
+    private val mutex = Mutex()
+    private val cache = MutableStateFlow<List<SearchHistoryResult>>(emptyList())
+    private var isLoaded = false
+
+    override val history: Flow<List<SearchHistoryResult>> = flow {
+        ensureLoaded()
+        emitAll(cache)
+    }
+
+    override suspend fun add(result: SearchHistoryResult) = withContext(dispatchers.io) {
+        mutex.withLock {
+            ensureLoadedLocked()
+            val updated = buildList {
+                add(result)
+                // Deduplicate: an equal entry is moved to the front rather than being duplicated.
+                addAll(cache.value.filterNot { it == result })
+            }
+                .distinct()
+                .take(MAX_SEARCH_HISTORY_SIZE)
+            cache.value = updated
+            persist(updated)
+        }
+    }
+
+    override suspend fun clear() = withContext<Unit>(dispatchers.io) {
+        mutex.withLock {
+            isLoaded = true
+            cache.value = emptyList()
+            runCatchingExceptions { fileStore.delete() }
+                .onFailure { Timber.e(it, "Failed to delete search history") }
+        }
+    }
+
+    private suspend fun ensureLoaded() = withContext(dispatchers.io) {
+        mutex.withLock {
+            ensureLoadedLocked()
+        }
+    }
+
+    /**
+     * Must be called while holding [mutex].
+     */
+    private fun ensureLoadedLocked() {
+        if (isLoaded) return
+        cache.value = readFromDisk()
+        isLoaded = true
+    }
+
+    private fun readFromDisk(): List<SearchHistoryResult> {
+        return runCatchingExceptions {
+            val bytes = fileStore.read() ?: return@runCatchingExceptions emptyList()
+            json.decodeFromString<List<SearchHistoryResult>>(bytes.decodeToString())
+        }.getOrElse {
+            Timber.e(it, "Failed to read search history, resetting it")
+            emptyList()
+        }
+    }
+
+    private fun persist(items: List<SearchHistoryResult>) {
+        runCatchingExceptions {
+            fileStore.write(json.encodeToString(items).encodeToByteArray())
+        }.onFailure { Timber.e(it, "Failed to persist search history") }
+    }
+}
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/SearchHistoryFileStore.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/SearchHistoryFileStore.kt
new file mode 100644
index 0000000000..9ba1fc6d03
--- /dev/null
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/SearchHistoryFileStore.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.search.history
+
+/**
+ * Low level, raw byte read/write of the persisted search history.
+ *
+ * This exists as a seam so that [DefaultSearchHistoryStore] can be unit tested without relying on
+ * the Android Keystore. The production implementation ([DefaultSearchHistoryFileStore]) stores the
+ * bytes in an encrypted file.
+ */
+interface SearchHistoryFileStore {
+    /**
+     * Return the persisted bytes, or `null` if nothing has been persisted yet.
+     */
+    fun read(): ByteArray?
+
+    /**
+     * Persist [bytes], replacing any previously persisted content.
+     */
+    fun write(bytes: ByteArray)
+
+    /**
+     * Delete any persisted content.
+     *
+     * @return `true` if the persisted content was deleted, `false` if there was no persisted content to delete.
+     */
+    fun delete(): Boolean
+}
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/SearchHistoryResult.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/SearchHistoryResult.kt
new file mode 100644
index 0000000000..1b883fa24e
--- /dev/null
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/SearchHistoryResult.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.search.history
+
+import io.element.android.libraries.matrix.api.core.RoomId
+import kotlinx.serialization.Serializable
+
+/**
+ * A single entry in the global search history.
+ *
+ * The history stores either the term used to perform a search (when the keyboard search action is
+ * triggered) or the id of a room opened from the search results.
+ */
+@Serializable
+sealed interface SearchHistoryResult {
+    @Serializable
+    data class Query(val term: String) : SearchHistoryResult
+
+    @Serializable
+    data class Room(val roomId: RoomId) : SearchHistoryResult
+}
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/SearchHistoryStore.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/SearchHistoryStore.kt
new file mode 100644
index 0000000000..7718d32f77
--- /dev/null
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/history/SearchHistoryStore.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.search.history
+
+import kotlinx.coroutines.flow.Flow
+
+/**
+ * Stores the global search history for the current session.
+ *
+ * The history is persisted in an encrypted file and capped to [MAX_SEARCH_HISTORY_SIZE] entries.
+ * The most recent entry is always at the front of the list; when the cap is reached the oldest
+ * entries are dropped.
+ */
+interface SearchHistoryStore {
+    /**
+     * Emits the current search history, most recent entry first, and re-emits whenever it changes.
+     */
+    val history: Flow<List<SearchHistoryResult>>
+
+    /**
+     * Add a new [result] at the front of the history.
+     *
+     * If an equal entry already exists it is moved to the front instead of being duplicated. When
+     * the history exceeds [MAX_SEARCH_HISTORY_SIZE] entries the oldest ones are dropped.
+     */
+    suspend fun add(result: SearchHistoryResult)
+
+    /**
+     * Remove every entry from the history.
+     */
+    suspend fun clear()
+}
+
+/**
+ * Maximum number of entries kept in the search history.
+ */
+const val MAX_SEARCH_HISTORY_SIZE = 25
diff --git a/features/home/impl/src/main/res/values/temporary.xml b/features/home/impl/src/main/res/values/temporary.xml
index c44001e5a6..556d8a050f 100644
--- a/features/home/impl/src/main/res/values/temporary.xml
+++ b/features/home/impl/src/main/res/values/temporary.xml
@@ -14,4 +14,5 @@
     <string name="search_section_messages">Messages</string>
     <string name="search_no_results_title">No results</string>
     <string name="search_no_results_subtitle">There are no results for “%1$s”. Try a new search term.</string>
+    <string name="screen_search_recent_searches_section_title">Recent searches</string>
 </resources>
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/GlobalSearchPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/GlobalSearchPresenterTest.kt
index 0c6b063705..6d54c59912 100644
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/GlobalSearchPresenterTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/GlobalSearchPresenterTest.kt
@@ -11,6 +11,9 @@ package io.element.android.features.home.impl.search
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.home.impl.datasource.aRoomListRoomSummaryFactory
+import io.element.android.features.home.impl.search.history.FakeSearchHistoryStore
+import io.element.android.features.home.impl.search.history.SearchHistoryResult
+import io.element.android.features.home.impl.search.history.SearchHistoryStore
 import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter
 import io.element.android.libraries.androidutils.filesize.FileSizeFormatter
 import io.element.android.libraries.architecture.AsyncData
@@ -28,6 +31,7 @@ import io.element.android.libraries.matrix.api.roomlist.RoomListFilter.Joined
 import io.element.android.libraries.matrix.api.roomlist.RoomListFilter.NormalizedMatchRoomName
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.libraries.matrix.api.search.MessageSearchService
+import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
 import io.element.android.libraries.matrix.test.room.aRoomSummary
@@ -41,12 +45,12 @@ import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import java.util.Optional
 
 class GlobalSearchPresenterTest {
     @Test
@@ -60,6 +64,8 @@ class GlobalSearchPresenterTest {
                 assertThat(state.currentTarget).isEqualTo(GlobalSearchTarget.ROOMS)
                 assertThat(state.results).isEqualTo(AsyncData.Uninitialized)
             }
+
+            cancelAndConsumeRemainingEvents()
         }
     }
 
@@ -85,6 +91,9 @@ class GlobalSearchPresenterTest {
     fun `present - toggle search visibility`() = runTest {
         val presenter = createGlobalSearchPresenter()
         presenter.test {
+            // Skip the initial state
+            skipItems(1)
+
             awaitItem().let { state ->
                 assertThat(state.isSearchActive).isFalse()
                 state.eventSink(GlobalSearchEvent.ToggleSearchVisibility)
@@ -103,6 +112,9 @@ class GlobalSearchPresenterTest {
     fun `present - update target`() = runTest {
         val presenter = createGlobalSearchPresenter()
         presenter.test {
+            // Skip initial item
+            skipItems(1)
+
             awaitItem().let { state ->
                 assertThat(state.currentTarget).isEqualTo(GlobalSearchTarget.ROOMS)
                 state.eventSink(GlobalSearchEvent.UpdateTarget(GlobalSearchTarget.MESSAGES))
@@ -194,7 +206,7 @@ class GlobalSearchPresenterTest {
     fun `present - message search results are mapped when the message search emits`() = runTest {
         val messageSearch = FakeMessageSearch()
         val matrixClient = FakeMatrixClient().apply {
-            getRoomInfoFlowLambda = { flowOf(Optional.of(aRoomInfo())) }
+            getRoomInfoLambda = { Result.success(aRoomInfo()) }
         }
         val presenter = createGlobalSearchPresenter(
             messageSearchService = FakeMessageSearchService(messageSearch),
@@ -221,7 +233,7 @@ class GlobalSearchPresenterTest {
     fun `present - message search displays the uninitialized state after removing the query`() = runTest {
         val messageSearch = FakeMessageSearch()
         val matrixClient = FakeMatrixClient().apply {
-            getRoomInfoFlowLambda = { flowOf(Optional.of(aRoomInfo())) }
+            getRoomInfoLambda = { Result.success(aRoomInfo()) }
         }
         val presenter = createGlobalSearchPresenter(
             messageSearchService = FakeMessageSearchService(messageSearch),
@@ -256,7 +268,7 @@ class GlobalSearchPresenterTest {
     fun `present - UpdateVisibleRange triggers pagination for messages when near the end`() = runTest {
         val messageSearch = FakeMessageSearch()
         val matrixClient = FakeMatrixClient().apply {
-            getRoomInfoFlowLambda = { flowOf(Optional.of(aRoomInfo())) }
+            getRoomInfoLambda = { Result.success(aRoomInfo()) }
         }
         val presenter = createGlobalSearchPresenter(
             messageSearchService = FakeMessageSearchService(messageSearch),
@@ -279,6 +291,82 @@ class GlobalSearchPresenterTest {
             cancelAndIgnoreRemainingEvents()
         }
     }
+
+    @Test
+    fun `present - SaveQueryToHistory stores the current query`() = runTest {
+        val searchHistoryStore = FakeSearchHistoryStore()
+        val presenter = createGlobalSearchPresenter(searchHistoryStore = searchHistoryStore)
+        presenter.test {
+            val initialState = awaitItem()
+            initialState.queryState.edit { append("A query") }
+            testScheduler.advanceUntilIdle()
+
+            initialState.eventSink(GlobalSearchEvent.SaveQueryToHistory)
+            testScheduler.advanceUntilIdle()
+
+            assertThat(searchHistoryStore.history.first()).containsExactly(SearchHistoryResult.Query("A query"))
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - SaveQueryToHistory ignores a blank query`() = runTest {
+        val searchHistoryStore = FakeSearchHistoryStore()
+        val presenter = createGlobalSearchPresenter(searchHistoryStore = searchHistoryStore)
+        presenter.test {
+            val initialState = awaitItem()
+            initialState.eventSink(GlobalSearchEvent.SaveQueryToHistory)
+            testScheduler.advanceUntilIdle()
+
+            assertThat(searchHistoryStore.history.first()).isEmpty()
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - SaveRoomToHistory stores the room`() = runTest {
+        val searchHistoryStore = FakeSearchHistoryStore()
+        val presenter = createGlobalSearchPresenter(searchHistoryStore = searchHistoryStore)
+        presenter.test {
+            val initialState = awaitItem()
+            initialState.eventSink(GlobalSearchEvent.SaveRoomToHistory(A_ROOM_ID))
+            testScheduler.advanceUntilIdle()
+
+            assertThat(searchHistoryStore.history.first()).containsExactly(SearchHistoryResult.Room(A_ROOM_ID))
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - SearchHistoryResultSelected does nothing for a room result`() = runTest {
+        val searchHistoryStore = FakeSearchHistoryStore()
+        val presenter = createGlobalSearchPresenter(searchHistoryStore = searchHistoryStore)
+        presenter.test {
+            val initialState = awaitItem()
+            skipItems(1)
+
+            initialState.eventSink(GlobalSearchEvent.SearchHistoryResultSelected(SearchHistoryResultItem.Room(A_ROOM_ID, aRoomInfo())))
+            testScheduler.advanceUntilIdle()
+
+            ensureAllEventsConsumed()
+        }
+    }
+
+    @Test
+    fun `present - SearchHistoryResultSelected changes the search query when a previous search is selected`() = runTest {
+        val searchHistoryStore = FakeSearchHistoryStore()
+        val presenter = createGlobalSearchPresenter(searchHistoryStore = searchHistoryStore)
+        presenter.test {
+            val initialState = awaitItem()
+            // Skip loading search results state
+            skipItems(1)
+
+            initialState.eventSink(GlobalSearchEvent.SearchHistoryResultSelected(SearchHistoryResultItem.Query("Test")))
+
+            assertThat(awaitItem().queryState.text.toString()).isEqualTo("Test")
+            assertThat(awaitItem().results.isLoading()).isTrue()
+        }
+    }
 }
 
 private fun TestScope.createGlobalSearchPresenter(
@@ -290,6 +378,7 @@ private fun TestScope.createGlobalSearchPresenter(
     fileSizeFormatter: FileSizeFormatter = FakeFileSizeFormatter(),
     permalinkParser: PermalinkParser = FakePermalinkParser(),
     matrixClient: MatrixClient = FakeMatrixClient(),
+    searchHistoryStore: SearchHistoryStore = FakeSearchHistoryStore(),
 ): GlobalSearchPresenter {
     return GlobalSearchPresenter(
         roomListSearchDataSourceFactory = object : RoomListSearchDataSource.Factory {
@@ -310,5 +399,6 @@ private fun TestScope.createGlobalSearchPresenter(
         permalinkParser = permalinkParser,
         coroutineDispatchers = testCoroutineDispatchers(),
         matrixClient = matrixClient,
+        searchHistoryStore = searchHistoryStore,
     )
 }
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/GlobalSearchViewTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/GlobalSearchViewTest.kt
new file mode 100644
index 0000000000..f63e21496e
--- /dev/null
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/GlobalSearchViewTest.kt
@@ -0,0 +1,275 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+@file:OptIn(ExperimentalTestApi::class)
+
+package io.element.android.features.home.impl.search
+
+import androidx.activity.ComponentActivity
+import androidx.compose.foundation.text.input.TextFieldState
+import androidx.compose.ui.test.AndroidComposeUiTest
+import androidx.compose.ui.test.ExperimentalTestApi
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.v2.runAndroidComposeUiTest
+import io.element.android.features.home.impl.R
+import io.element.android.features.home.impl.model.aRoomListRoomSummary
+import io.element.android.libraries.architecture.AsyncData
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.tests.testutils.EnsureCalledOnceWithTwoParams
+import io.element.android.tests.testutils.EnsureNeverCalledWithTwoParams
+import io.element.android.tests.testutils.EventsRecorder
+import io.element.android.tests.testutils.clickOn
+import io.element.android.tests.testutils.pressBack
+import io.element.android.tests.testutils.pressBackKey
+import io.element.android.tests.testutils.robolectric.RobolectricTest
+import kotlinx.collections.immutable.persistentListOf
+import org.junit.Test
+
+class GlobalSearchViewTest : RobolectricTest() {
+    @Test
+    fun `back button - emits the expected Event`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<GlobalSearchEvent>()
+        setGlobalSearchView(
+            state = aGlobalSearchState(
+                isSearchActive = true,
+                eventSink = eventsRecorder,
+            ),
+        )
+        // Remove automatic initial events
+        eventsRecorder.clear()
+        pressBack()
+        eventsRecorder.assertSingle(GlobalSearchEvent.ToggleSearchVisibility)
+    }
+
+    @Test
+    fun `back key - with search active toggles the search`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<GlobalSearchEvent>()
+        setGlobalSearchView(
+            state = aGlobalSearchState(
+                isSearchActive = true,
+                eventSink = eventsRecorder,
+            ),
+        )
+        // Remove automatic initial events
+        eventsRecorder.clear()
+        pressBackKey()
+
+        // Advance time to let the event be processed, as the search toggle might have some delay (e.g. for the animation)
+        mainClock.advanceTimeBy(1)
+
+        eventsRecorder.assertSingle(GlobalSearchEvent.ToggleSearchVisibility)
+    }
+
+    @Test
+    fun `clear query button - emits the expected Event`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<GlobalSearchEvent>()
+        setGlobalSearchView(
+            state = aGlobalSearchState(
+                isSearchActive = true,
+                queryState = TextFieldState("Query"),
+                eventSink = eventsRecorder,
+            ),
+        )
+        // Remove automatic initial events
+        eventsRecorder.clear()
+        val clearSearch = activity!!.getString(CommonStrings.a11y_clear_search_field)
+        onNodeWithContentDescription(clearSearch).performClick()
+        eventsRecorder.assertSingle(GlobalSearchEvent.ClearQuery)
+    }
+
+    @Test
+    fun `search target selector - clicking on 'Chats' emits the expected Event`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<GlobalSearchEvent>()
+        setGlobalSearchView(
+            state = aGlobalSearchState(
+                isSearchActive = true,
+                currentTarget = GlobalSearchTarget.MESSAGES,
+                queryState = TextFieldState("Query"),
+                eventSink = eventsRecorder,
+            ),
+        )
+        // Remove automatic initial events
+        eventsRecorder.clear()
+        clickOn(R.string.search_section_chats)
+        eventsRecorder.assertSingle(GlobalSearchEvent.UpdateTarget(GlobalSearchTarget.ROOMS))
+    }
+
+    @Test
+    fun `search target selector - clicking on 'Messages' emits the expected Event`() = runAndroidComposeUiTest {
+        val eventsRecorder = EventsRecorder<GlobalSearchEvent>()
+        setGlobalSearchView(
+            state = aGlobalSearchState(
+                isSearchActive = true,
+                currentTarget = GlobalSearchTarget.ROOMS,
+                queryState = TextFieldState("Query"),
+                eventSink = eventsRecorder,
+            ),
+        )
+        // Remove automatic initial events
+        eventsRecorder.clear()
+        clickOn(R.string.search_section_messages)
+        eventsRecorder.assertSingle(GlobalSearchEvent.UpdateTarget(GlobalSearchTarget.MESSAGES))
+    }
+
+    @Test
+    fun `clicking on a room result - invokes the callback and saves it to the history`() = runAndroidComposeUiTest {
+        val roomId = RoomId("!aRoom:server.org")
+        val eventsRecorder = EventsRecorder<GlobalSearchEvent>()
+        val onSelectSearchResult = EnsureCalledOnceWithTwoParams<RoomId, EventId?>(roomId, null)
+        setGlobalSearchView(
+            state = aGlobalSearchState(
+                isSearchActive = true,
+                currentTarget = GlobalSearchTarget.ROOMS,
+                queryState = TextFieldState("Query"),
+                results = AsyncData.Success(
+                    GlobalSearchResults.RoomListResults(
+                        persistentListOf(
+                            aRoomListRoomSummary(id = roomId.value, name = "A room result"),
+                        )
+                    )
+                ),
+                eventSink = eventsRecorder,
+            ),
+            onSelectSearchResult = onSelectSearchResult,
+        )
+        // Remove automatic initial events
+        eventsRecorder.clear()
+        onNodeWithText("A room result").performClick()
+        onSelectSearchResult.assertSuccess()
+        eventsRecorder.assertSingle(GlobalSearchEvent.SaveRoomToHistory(roomId))
+    }
+
+    @Test
+    fun `clicking on a message result - invokes the callback and saves it to the history`() = runAndroidComposeUiTest {
+        val roomId = RoomId("!aMessageRoom:server.org")
+        val eventId = EventId("\$anEvent:server.org")
+        val eventsRecorder = EventsRecorder<GlobalSearchEvent>()
+        val onSelectSearchResult = EnsureCalledOnceWithTwoParams<RoomId, EventId?>(roomId, eventId)
+        setGlobalSearchView(
+            state = aGlobalSearchState(
+                isSearchActive = true,
+                currentTarget = GlobalSearchTarget.MESSAGES,
+                queryState = TextFieldState("Query"),
+                results = AsyncData.Success(
+                    GlobalSearchResults.MessageSearchResults(
+                        persistentListOf(
+                            MessageSearchResultItem.Message(
+                                messageSearchResult = aMessageSearchResult(roomId = roomId, eventId = eventId),
+                                body = "A message body",
+                                roomInfo = aRoomInfo(id = roomId, name = "A message room"),
+                                formattedTimestamp = "12:00",
+                            ),
+                        )
+                    )
+                ),
+                eventSink = eventsRecorder,
+            ),
+            onSelectSearchResult = onSelectSearchResult,
+        )
+        // Remove automatic initial events
+        eventsRecorder.clear()
+        onNodeWithText("A message room").performClick()
+        onSelectSearchResult.assertSuccess()
+        eventsRecorder.assertSingle(GlobalSearchEvent.SaveRoomToHistory(roomId))
+    }
+
+    @Test
+    fun `clicking on a history query result - emits the expected Event`() = runAndroidComposeUiTest {
+        val queryResult = SearchHistoryResultItem.Query("Recent term")
+        val eventsRecorder = EventsRecorder<GlobalSearchEvent>()
+        setGlobalSearchView(
+            state = aGlobalSearchState(
+                isSearchActive = true,
+                queryState = TextFieldState(),
+                results = AsyncData.Uninitialized,
+                history = AsyncData.Success(persistentListOf(queryResult)),
+                eventSink = eventsRecorder,
+            ),
+            // A query history result must not trigger the search result callback
+            onSelectSearchResult = EnsureNeverCalledWithTwoParams(),
+        )
+        // Remove automatic initial events
+        eventsRecorder.clear()
+        onNodeWithText("Recent term").performClick()
+        eventsRecorder.assertSingle(GlobalSearchEvent.SearchHistoryResultSelected(queryResult))
+    }
+
+    @Test
+    fun `clicking on a history room result - invokes the callback and emits the expected Events`() = runAndroidComposeUiTest {
+        val roomId = RoomId("!aHistoryRoom:server.org")
+        val roomResult = SearchHistoryResultItem.Room(
+            roomId = roomId,
+            roomInfo = aRoomInfo(id = roomId, name = "A history room"),
+        )
+        val eventsRecorder = EventsRecorder<GlobalSearchEvent>()
+        val onSelectSearchResult = EnsureCalledOnceWithTwoParams<RoomId, EventId?>(roomId, null)
+        setGlobalSearchView(
+            state = aGlobalSearchState(
+                isSearchActive = true,
+                queryState = TextFieldState(),
+                results = AsyncData.Uninitialized,
+                history = AsyncData.Success(persistentListOf(roomResult)),
+                eventSink = eventsRecorder,
+            ),
+            onSelectSearchResult = onSelectSearchResult,
+        )
+        // Remove automatic initial events
+        eventsRecorder.clear()
+        onNodeWithText("A history room").performClick()
+        onSelectSearchResult.assertSuccess()
+        eventsRecorder.assertList(
+            listOf(
+                GlobalSearchEvent.SaveRoomToHistory(roomId),
+                GlobalSearchEvent.SearchHistoryResultSelected(roomResult),
+            )
+        )
+    }
+
+    @Test
+    fun `with a query and uninitialized results - displays the start searching placeholder`() = runAndroidComposeUiTest {
+        setGlobalSearchView(
+            state = aGlobalSearchState(
+                isSearchActive = true,
+                queryState = TextFieldState("Query"),
+                results = AsyncData.Uninitialized,
+            ),
+        )
+        val startSearching = activity!!.getString(R.string.start_searching_title)
+        onNodeWithText(startSearching).assertIsDisplayed()
+    }
+
+    @Test
+    fun `with empty results - displays the no results placeholder`() = runAndroidComposeUiTest {
+        setGlobalSearchView(
+            state = aGlobalSearchState(
+                isSearchActive = true,
+                currentTarget = GlobalSearchTarget.ROOMS,
+                queryState = TextFieldState("Query"),
+                results = AsyncData.Success(GlobalSearchResults.RoomListResults(persistentListOf())),
+            ),
+        )
+        val noResults = activity!!.getString(R.string.search_no_results_title)
+        onNodeWithText(noResults).assertIsDisplayed()
+    }
+
+    private fun AndroidComposeUiTest<ComponentActivity>.setGlobalSearchView(
+        state: GlobalSearchState,
+        onSelectSearchResult: (RoomId, EventId?) -> Unit = EnsureNeverCalledWithTwoParams(),
+    ) {
+        setContent {
+            GlobalSearchView(
+                state = state,
+                onSelectSearchResult = onSelectSearchResult,
+            )
+        }
+    }
+}
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/history/DefaultSearchHistoryStoreTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/history/DefaultSearchHistoryStoreTest.kt
new file mode 100644
index 0000000000..a0a63755dc
--- /dev/null
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/history/DefaultSearchHistoryStoreTest.kt
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.search.history
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.tests.testutils.testCoroutineDispatchers
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runTest
+import kotlinx.serialization.json.Json
+import org.junit.Test
+
+class DefaultSearchHistoryStoreTest {
+    @Test
+    fun `history is empty when nothing has been persisted`() = runTest {
+        val store = createStore()
+        assertThat(store.history.first()).isEmpty()
+    }
+
+    @Test
+    fun `add prepends new entries so the most recent is first`() = runTest {
+        val store = createStore()
+        store.add(SearchHistoryResult.Query("first"))
+        store.add(SearchHistoryResult.Query("second"))
+        assertThat(store.history.first()).containsExactly(
+            SearchHistoryResult.Query("second"),
+            SearchHistoryResult.Query("first"),
+        ).inOrder()
+    }
+
+    @Test
+    fun `add supports both queries and rooms`() = runTest {
+        val store = createStore()
+        store.add(SearchHistoryResult.Query("term"))
+        store.add(SearchHistoryResult.Room(A_ROOM_ID))
+        assertThat(store.history.first()).containsExactly(
+            SearchHistoryResult.Room(A_ROOM_ID),
+            SearchHistoryResult.Query("term"),
+        ).inOrder()
+    }
+
+    @Test
+    fun `adding an existing entry moves it to the front without duplicating`() = runTest {
+        val store = createStore()
+        store.add(SearchHistoryResult.Query("a"))
+        store.add(SearchHistoryResult.Query("b"))
+        store.add(SearchHistoryResult.Query("a"))
+        assertThat(store.history.first()).containsExactly(
+            SearchHistoryResult.Query("a"),
+            SearchHistoryResult.Query("b"),
+        ).inOrder()
+    }
+
+    @Test
+    fun `history is capped to the maximum size, dropping the oldest entries`() = runTest {
+        val store = createStore()
+        repeat(MAX_SEARCH_HISTORY_SIZE + 10) { index ->
+            store.add(SearchHistoryResult.Query("query$index"))
+        }
+        val history = store.history.first()
+        assertThat(history).hasSize(MAX_SEARCH_HISTORY_SIZE)
+        // Newest entry is first...
+        assertThat(history.first()).isEqualTo(SearchHistoryResult.Query("query${MAX_SEARCH_HISTORY_SIZE + 9}"))
+        // ...and the oldest ones have been dropped.
+        assertThat(history).doesNotContain(SearchHistoryResult.Query("query0"))
+        assertThat(history.last()).isEqualTo(SearchHistoryResult.Query("query10"))
+    }
+
+    @Test
+    fun `persisted history is deserialized back into SearchHistoryResult items`() = runTest {
+        val fileStore = FakeSearchHistoryFileStore()
+        createStore(fileStore).apply {
+            add(SearchHistoryResult.Query("persisted term"))
+            add(SearchHistoryResult.Room(A_ROOM_ID))
+        }
+
+        // A brand new store backed by the same file reads the same content back.
+        val reloaded = createStore(fileStore)
+        assertThat(reloaded.history.first()).containsExactly(
+            SearchHistoryResult.Room(A_ROOM_ID),
+            SearchHistoryResult.Query("persisted term"),
+        ).inOrder()
+    }
+
+    @Test
+    fun `clear removes every entry and deletes the persisted content`() = runTest {
+        val fileStore = FakeSearchHistoryFileStore()
+        val store = createStore(fileStore)
+        store.add(SearchHistoryResult.Query("term"))
+
+        store.clear()
+
+        assertThat(store.history.first()).isEmpty()
+        assertThat(fileStore.content).isNull()
+    }
+
+    @Test
+    fun `corrupted content is ignored and results in an empty history`() = runTest {
+        val fileStore = FakeSearchHistoryFileStore(initialContent = "not valid json".toByteArray())
+        val store = createStore(fileStore)
+        assertThat(store.history.first()).isEmpty()
+        // The store recovers and can still add new entries.
+        store.add(SearchHistoryResult.Room(RoomId("!recovered:domain")))
+        assertThat(store.history.first()).containsExactly(SearchHistoryResult.Room(RoomId("!recovered:domain")))
+    }
+
+    private fun TestScope.createStore(
+        fileStore: SearchHistoryFileStore = FakeSearchHistoryFileStore(),
+    ) = DefaultSearchHistoryStore(
+        fileStore = fileStore,
+        dispatchers = testCoroutineDispatchers(),
+        jsonProvider = { Json { ignoreUnknownKeys = true } }
+    )
+}
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/history/FakeSearchHistoryFileStore.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/history/FakeSearchHistoryFileStore.kt
new file mode 100644
index 0000000000..ef8ce19b1f
--- /dev/null
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/history/FakeSearchHistoryFileStore.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.search.history
+
+/**
+ * In-memory [SearchHistoryFileStore] used to test [DefaultSearchHistoryStore] without the Android Keystore.
+ */
+class FakeSearchHistoryFileStore(
+    initialContent: ByteArray? = null,
+) : SearchHistoryFileStore {
+    var content: ByteArray? = initialContent
+        private set
+
+    var writeCount = 0
+        private set
+
+    override fun read(): ByteArray? = content
+
+    override fun write(bytes: ByteArray) {
+        content = bytes
+        writeCount++
+    }
+
+    override fun delete(): Boolean {
+        content = null
+        return true
+    }
+}
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/history/FakeSearchHistoryStore.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/history/FakeSearchHistoryStore.kt
new file mode 100644
index 0000000000..14d6a7ce65
--- /dev/null
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/history/FakeSearchHistoryStore.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.search.history
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+
+class FakeSearchHistoryStore : SearchHistoryStore {
+    private val state = MutableStateFlow<List<SearchHistoryResult>>(emptyList())
+
+    override val history: Flow<List<SearchHistoryResult>> = state
+
+    override suspend fun add(result: SearchHistoryResult) {
+        state.value = buildList {
+            add(result)
+            addAll(state.value.filterNot { it == result })
+        }.take(MAX_SEARCH_HISTORY_SIZE)
+    }
+
+    override suspend fun clear() {
+        state.value = emptyList()
+    }
+}
diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/history/SearchHistoryResultSerializationTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/history/SearchHistoryResultSerializationTest.kt
new file mode 100644
index 0000000000..95a649d88b
--- /dev/null
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/history/SearchHistoryResultSerializationTest.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.home.impl.search.history
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_ROOM_ID_2
+import kotlinx.serialization.json.Json
+import org.junit.Test
+
+class SearchHistoryResultSerializationTest {
+    private val json = Json
+
+    @Test
+    fun `Query round-trips through serialization`() {
+        val original: SearchHistoryResult = SearchHistoryResult.Query("hello world")
+        val decoded = json.decodeFromString<SearchHistoryResult>(json.encodeToString(original))
+        assertThat(decoded).isEqualTo(original)
+    }
+
+    @Test
+    fun `Room round-trips through serialization`() {
+        val original: SearchHistoryResult = SearchHistoryResult.Room(A_ROOM_ID)
+        val decoded = json.decodeFromString<SearchHistoryResult>(json.encodeToString(original))
+        assertThat(decoded).isEqualTo(original)
+    }
+
+    @Test
+    fun `RoomId is serialized as its raw string value`() {
+        val encoded = json.encodeToString<SearchHistoryResult>(SearchHistoryResult.Room(A_ROOM_ID))
+        assertThat(encoded).contains(A_ROOM_ID.value)
+    }
+
+    @Test
+    fun `a mixed list round-trips preserving order`() {
+        val original = listOf(
+            SearchHistoryResult.Query("first"),
+            SearchHistoryResult.Room(A_ROOM_ID),
+            SearchHistoryResult.Query("second"),
+            SearchHistoryResult.Room(A_ROOM_ID_2),
+        )
+        val decoded = json.decodeFromString<List<SearchHistoryResult>>(json.encodeToString(original))
+        assertThat(decoded).containsExactlyElementsIn(original).inOrder()
+    }
+}
diff --git a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/crypto/EncryptedFile.kt b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/crypto/EncryptedFile.kt
index ee6b381e08..488928782f 100644
--- a/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/crypto/EncryptedFile.kt
+++ b/libraries/encrypted-db/src/main/kotlin/io/element/encrypteddb/crypto/EncryptedFile.kt
@@ -25,7 +25,7 @@ import java.io.FileOutputStream
  *
  * It uses hardcoded constants that are used in that library, for backwards compatibility reasons.
  */
-internal class EncryptedFile(
+class EncryptedFile(
     private val context: Context,
     private val file: File
 ) {
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt
index 3f98dcc509..e43f362e7c 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt
@@ -326,6 +326,11 @@ interface MatrixClient : ClientUrlContentFetcher {
      */
     suspend fun uploadMedia(mimeType: String, data: ByteArray): Result<String>
 
+    /**
+     * Returns the latest [RoomInfo] of a room, if known to the client, or `null` if the room is unknown.
+     */
+    suspend fun getRoomInfo(roomId: RoomId): Result<RoomInfo?>
+
     /**
      * Get a room info flow for a given room ID.
      * The flow will emit a new value whenever the room info is updated, skipping duplicates, and an empty [Optional] if the room is not found.
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomId.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomId.kt
index 1758563f55..f4597de640 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomId.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomId.kt
@@ -11,6 +11,7 @@ package io.element.android.libraries.matrix.api.core
 import io.element.android.libraries.androidutils.metadata.isInDebug
 import java.io.Serializable
 
+@kotlinx.serialization.Serializable
 @JvmInline
 value class RoomId(val value: String) : Serializable {
     init {
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
index a36184d6bd..86414ed6a3 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
@@ -779,6 +779,14 @@ class RustMatrixClient(
         }
     }
 
+    override suspend fun getRoomInfo(roomId: RoomId): Result<RoomInfo?> = withContext(sessionDispatcher) {
+        runCatchingExceptions {
+            innerRoomListService.roomOrNull(roomId.value)?.use { room ->
+                roomInfoMapper.map(room.roomInfo())
+            }
+        }
+    }
+
     override fun getRoomInfoFlow(roomId: RoomId): Flow<Optional<RoomInfo>> {
         return mxCallbackFlow {
             val roomNotFound = innerRoomListService.roomOrNull(roomId.value).use { it == null }
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
index 6ba42270fe..f176d3b006 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
@@ -74,6 +74,7 @@ import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.TestScope
 import java.io.File
 import java.util.Optional
+import kotlin.jvm.optionals.getOrNull
 
 class FakeMatrixClient(
     override val sessionId: SessionId = A_SESSION_ID,
@@ -173,6 +174,7 @@ class FakeMatrixClient(
     var knockRoomLambda: (RoomIdOrAlias, String, List<String>) -> Result<RoomInfo?> = { _, _, _ ->
         Result.success(null)
     }
+    var getRoomInfoLambda = { _: RoomId -> Result.success<RoomInfo?>(null) }
     var getRoomInfoFlowLambda = { _: RoomId ->
         flowOf<Optional<RoomInfo>>(Optional.empty())
     }
@@ -379,6 +381,8 @@ class FakeMatrixClient(
         return Result.success(visitedRoomsId)
     }
 
+    override suspend fun getRoomInfo(roomId: RoomId): Result<RoomInfo?> = getRoomInfoLambda(roomId)
+
     override fun getRoomInfoFlow(roomId: RoomId) = getRoomInfoFlowLambda(roomId)
 
     var setAllSendQueuesEnabledLambda = lambdaRecorder(ensureNeverCalled = true) { _: Boolean ->
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_1_en.png
index 955af7bb9a..cf9fae8073 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a856467fba0134aefcad2428493ce9169fccf90705b71d540c2eed935d9b625e
-size 22639
+oid sha256:f151897252a3e5b0fd4cf084d07281446073444a434252afef803815f8e451d6
+size 22948
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_2_en.png
index a4fa915963..9f61ba64d8 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70386b8f6a8998f246819c6d643543babcf41ba72db86db40559a755876c7650
-size 12144
+oid sha256:ecdc3be22cbdbb5886d6e1e56d8054a538e3d84b37998398aeed618e1847fba2
+size 12605
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_3_en.png
index 25a66543da..601d2e6823 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18498dbff28491dd108900453eab13d8224aa7960eefbe25993dcc82198677dd
-size 35825
+oid sha256:afc7a28ad19df48ece0f058599022b1d89e11c9eafe7d392e00ae1cb4be24cf1
+size 36369
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_4_en.png
index be7992706c..8df455cc58 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:346946f668bf18908480bf6b97158adcd7d9099d4be111055412ac2d4b7094c9
-size 77330
+oid sha256:73264974cfae3cd80629bbd0e046dd9fe195997e2fe92beb42fae7d642171595
+size 77494
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_5_en.png
index ca2936923c..00cf5a5d8e 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc3946915978e17cf404469273a5ff174c12f53da8fc3cff53ac6df8721e0182
-size 23522
+oid sha256:5232211c95eb4711edde2d4f7fc8dbd324ad133aa0a79f44ae563a442431fd55
+size 23885
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_6_en.png
new file mode 100644
index 0000000000..2b232b1b57
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Day_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46b6afded292b0ed12f943642974c75b3143b5ac6449bd0c83aeb1c998cccdd6
+size 53076
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_1_en.png
index cfef0a6883..12e9c70197 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad20c730bb320093a5c639938430e6851244e4425b46f3ae10262d9ca96215a4
-size 21972
+oid sha256:60de424229dfea308287bee383a9e5688d209d519b7a3c0b752b94bc6e458c51
+size 22312
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_2_en.png
index ec806ea229..fabd426934 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb20125a38d4d9436bee64de8f8d09d4afa372a72b7e33325b8d69f5b5760cdd
-size 11694
+oid sha256:c84e890f4cb364ec0c450ade4daf16848f7fc1961d9d57d98acdc77474f042da
+size 12103
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_3_en.png
index 8dc241988a..5f7a1c2a05 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7d01b051fda7a3f6dc7736bdbd631bd2e0f0cef61dbd9c973b48cee1e69d56c
-size 35624
+oid sha256:d7551aa6d84010695a2828828ca07977ecd9323289264ae3eaef22093102a1c8
+size 35953
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_4_en.png
index 8e618f0070..5330f9be34 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6637c79e684bf350204756a93679163fb17b8cf5f54c835fe81464d644edc3ff
-size 75840
+oid sha256:8a40ad67305f16235b54d700975e3b0929b3cfbe3a0af3aa8f6756034c137696
+size 76067
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_5_en.png
index 2864a9ffc8..8f714af1de 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e305c212a008854c19255f91824631d55d9fb523799ecad9b50039aa8b178323
-size 23053
+oid sha256:ba9f7d65b3be6c4f5f067db03c7eeba40075fb07070d22c67980247e77282e12
+size 23363
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_6_en.png
new file mode 100644
index 0000000000..9eb44a0c9e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_GlobalSearchView_Night_6_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc84b79da7defdd738665606603cf84b72a4acf4de521c86ab715ae8460d416b
+size 51588
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en.png
index 5fe8e62f96..ae365f5143 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2e211a700dfcefab1927926ecd2ab1eee2ceaed6980657e1bad1e70bbc69dd5
-size 29522
+oid sha256:645349979f0789dd674b9efcaee305a35955725c5c4d24599984aefc3a61b18f
+size 32005
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en.png
index 33110584a9..f0bfd0f2b4 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbdf9740221b82aaaf332c95e7299594f0b4fdd258b2e9c733133bdd4a01f692
-size 28378
+oid sha256:e82c6e4ff563e7ae870431528d9413ac915e16ca0151aa3c86ff5081bfc72478
+size 27563
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_3_en.png
index d002a79378..93d24c8613 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab30267a07b1ceb43c1a7f854e758c68123812d99054f6e94db4cccf3214a2b4
-size 41479
+oid sha256:3cd12ed914f8c161ef845feaaec416eec9ef1ae6d23d71fb444c93d1388738ea
+size 41736
diff --git a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_3_en.png
index 42ecbe8a68..438d96608d 100644
--- a/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.knockrequests.impl.list_KnockRequestsListView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:471abc7c54d0f90ad5a923bd21abbf0960bbb9cbbdb22313a779083baf61ab3f
-size 40671
+oid sha256:ae0b92a52a7f2c0533af7d7f0fbddc6497778e7c5dcedc3344a2ba60a6a948f8
+size 40439
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_0_en.png
index 23bb00edfe..48598e410f 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7270b97b04cd403a5d5e34b55b3303be08497fcb5d750d024565ffa17d20802c
-size 31808
+oid sha256:5c79c83bde346bec65f67c34805407e46b351b2c91772c13e0a6c23ae09bf7e8
+size 30345
diff --git a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Night_0_en.png
index 9945685453..d22d7f98cf 100644
--- a/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.linknewdevice.impl.screens.qrcode_ShowQrCodeView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29ee97865bc634eb1f30d6866a0a2badc91b5453ded11d7f4905c46db9c0c324
-size 29775
+oid sha256:ff17ff66d5c92ab19ce8064e2e14326e9f2921c1b7313a3974547b2932cb7fb1
+size 32295
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_0_en.png
index 374acc4a7a..33ef3511ec 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f879dd8636314113c9962bedae376f34057fd7af62a3725ef9aca7913ef08abc
-size 20453
+oid sha256:8f03643af6b4643c0fbfee2d98138aa0350d0fb541de0a8a627570030a8f3812
+size 20466
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_1_en.png
index 60bf32612b..b1bdcee7a4 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e44d67574a6d3df53f9c9a6d588461dda932cc77142c07605e2a53a0f7c33819
-size 36440
+oid sha256:f53a6b803268437c30350857951422dc1723a38922db4441a97bcb926a0e63ff
+size 38724
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_2_en.png
index a91262bdf2..b597367206 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1482966c7528de972c7a9af647eb249329777b4f60f05ffd1794a1cdc8115dd
-size 34889
+oid sha256:77ce52ef94d449d8eb37a8d84b297800a1663bc38dc27e2ea87e6f7da373195b
+size 37222
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_3_en.png
index caa435aca2..56bc529007 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:455ad29386413801da964f034b284c3693ed2281510cfdb0e6a0e50478904098
-size 32472
+oid sha256:76c4f1674cda818e0684869050fbad2cb31c02146726d1ee5e57481940218d29
+size 30363
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_4_en.png
index 374acc4a7a..33ef3511ec 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f879dd8636314113c9962bedae376f34057fd7af62a3725ef9aca7913ef08abc
-size 20453
+oid sha256:8f03643af6b4643c0fbfee2d98138aa0350d0fb541de0a8a627570030a8f3812
+size 20466
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_5_en.png
index 740c6fd618..be619b419b 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ca62fd1055aef95b255d40b7f8933e455a7fd7014c96e9e5eef04a9cff5549a
-size 22324
+oid sha256:fc017e7707b83549cda8c06ffe8466596372132ba0b58dd91cfb20c451b6a417
+size 22303
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_6_en.png
index 380f1ec5b2..201c56516e 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ddc6b2ec2417a2794e9ca0bfd88fae8f63e6d6f567582498157720092acd957
-size 26734
+oid sha256:2f5ca554e1ae330865af0d267934d8d1c6dfe42cc3958db3b15b13d376e8721c
+size 26667
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_7_en.png
index 75f447d578..3d4aa9edc5 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a205abcee059aef3f902cac7716a5bb53127b98ab29d97b0b44cbaa6ba5cdabe
-size 42394
+oid sha256:fd18d8bb6e61f616451439dff8690afc7473461c87adf11bb9870319d8e06fc4
+size 38447
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_8_en.png
index d4f298adb5..fb4db2984e 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d9a51a8b9c8799af008fca5e684c1fd107b6240f0e5f273b1559022c70ce5e31
-size 46363
+oid sha256:f8c9a2dd2c3677281b6486af6a0b8a5405dc59bff0390b6ce1bca1cc63d88b0d
+size 42546
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_9_en.png
index f6c445eee1..d194937309 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbb35e33035a9c22164128414bde7f6df848193040eef3bd7f073b0b182a7306
-size 21670
+oid sha256:ebeb2f14074a9bc91dc892bfa056c9c67e83a64c64d645c77d312d64895e3815
+size 21611
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_0_en.png
index c07cad6219..70de0a28d5 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bd18f0f95a41705cb18e753f7b99492aeba1a994cb02c95275bd7c14b5d983a
-size 19886
+oid sha256:dc9a8778869e47b9874c4300cac52045c4be5fac6590acbaa719a065249ed3f5
+size 19856
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_1_en.png
index 21eb862eda..d9f4faabc7 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0cd7909eb2cce4ce2ad297791527468a18b43343c4f4c7b1bb7ab5ade6cfc9d
-size 36959
+oid sha256:124381cc86542b2704b619e798f62f58dc7f3b95ab8a1c4eec3fa4b849462f9e
+size 34867
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_2_en.png
index 91d309165f..432cbde734 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:33c7e31962e562c4217629795ad0d79be10add9723e657f1a8dc3c4c16ac4ed4
-size 35476
+oid sha256:f373df8ce07aa19d467d43306f5a8d6c78915e4e166e08e39bb39cb303b5faec
+size 33305
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_3_en.png
index b9e79d2337..317a87e2e5 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8721e0c604b0e12ba22db934ab93794e6c2143d1b4bc4e2f3d297f9121c1e688
-size 29233
+oid sha256:ebbeb66a3f67e48668cadb96069f50feba5f4346119ea62c9dfd83ffd621b7b2
+size 31182
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_4_en.png
index c07cad6219..70de0a28d5 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bd18f0f95a41705cb18e753f7b99492aeba1a994cb02c95275bd7c14b5d983a
-size 19886
+oid sha256:dc9a8778869e47b9874c4300cac52045c4be5fac6590acbaa719a065249ed3f5
+size 19856
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_5_en.png
index 46f4412ab9..d261494eb8 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:299310684787f8c18e4219e69125ce48d32d229b4bb3087da7e102aa87ea1ac7
-size 21599
+oid sha256:8a3d7220c216b6fee2384ba2cb263903a8cfa45f3f97302c722188a4a827c575
+size 21630
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_6_en.png
index 259466128e..56ef074549 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11c3fe98b80dd8823e3eeafccda7aa5430dc6a691d2568f2a186c14f6a340360
-size 25824
+oid sha256:24b8f832cbaa9aaad66187255adcefbb2d7c4407b911c2675a261b6f480aa277
+size 25858
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_7_en.png
index 5732afb34a..e66ccc603d 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dfaee97064c6391c9e611e30bfb36d3abb8d10d2e3312cd21afa3b2b362637cf
-size 36805
+oid sha256:1e31aa9639a3805e3644fadbb01ab3503aedee068655920555a4817ae38b6376
+size 40312
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_8_en.png
index 549c353b64..f2f4d7c766 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b56fa8390836f84984130ac90af3a8e2244ab06d1460133883aa266e73b4567
-size 40742
+oid sha256:77e1a15b548d944e57b7d71229c28692e32ad9340d04ec0c43c52dafe16e3ae1
+size 44172
diff --git a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_9_en.png
index 1cf67b2855..dcf2ab131b 100644
--- a/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.location.impl.share_ShareLocationView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e68d95e8c4734d26e0853c886f8253c3ff21508fdf97dac8879e67d25a683e06
-size 19899
+oid sha256:cab8ea5b016f20de07dd0134836c42f9fd51562837fe4da2be8a8d38ca1f95f8
+size 19914
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.components_PinEntryTextField_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.components_PinEntryTextField_Day_0_en.png
index 72c3e43f5a..3a22d6959f 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.components_PinEntryTextField_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.components_PinEntryTextField_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24edc821b92f0686eb1cdc3a8214adacf490f9f586637e7c23adeaf904e6704a
-size 16292
+oid sha256:2046f1225b2f58812502196f4b7d1c7a4d87f740b32e40dd82762fade1c42ea2
+size 16167
diff --git a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.components_PinEntryTextField_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.components_PinEntryTextField_Night_0_en.png
index 5c49c08509..10223f5bf6 100644
--- a/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.components_PinEntryTextField_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.lockscreen.impl.components_PinEntryTextField_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58a6cbe83f86bbd32c8576a4d62a26794560f53b60c9bf5dc74aa0dd50e2dc87
-size 16238
+oid sha256:62384687c273cb57dbd25bfaa558d83e3efc527fc4dfff4aca8bf85ab1ce9e4b
+size 16446
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_en.png
index 8edee63bc1..3192cf2a5e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de82970da241172b94f822f8792e6fc721dcfc7f0f67e3523962e253e9750884
-size 255933
+oid sha256:1885bbe8b0ea497ac20d7bcdd0c6a93ba0533e898378d35e1cafdc8c9924fd56
+size 279984
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_en.png
index ccfdd7d9ed..f899ad5d43 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe6cb72de5079be2ac02ec39f74bac0d20492cd6f5509b71ad9cfc4cc52955d3
-size 326468
+oid sha256:1ca032575e4ebd75a2ebc5a4cb9f966e48cdfa56f4ff42d6d9309fa3577a1adb
+size 310609
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en.png
index 5f51b27f5e..693a36b7dd 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3274314ab9e39c23a6b9d66adf80ac8bb7b364ce60a300f96582374a18bc821f
-size 54590
+oid sha256:3dbb8ef39b6a7a0c2f576d8bd101aa97c89da696f23e6d5836846494471c01a1
+size 55799
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png
index e1f6ee6430..b1850a50a5 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e27c7c51fe07cca51b92a601aa9c58deab609bfa5e82f8f6f88eaab6ae59ec3
-size 64307
+oid sha256:f1dd0da147212e13a6c0ad5ad8f85ce55666c444076c238ea27eba5605cfab1f
+size 56909
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en.png
index 5289eaca63..4185f46b51 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65f9ee083a73669a0d3f9d88141a610ea53f3c39e89d8f706d414b04555b4764
-size 59321
+oid sha256:085963fcb425147d35a9ad947a7a3e4ba4712bd3d2f32e93099ff15cffe83b88
+size 64761
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en.png
index d3f7da6320..2e70435fa5 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a94a4cc176b5d52ef9b21339749324adeef9857b6cdaa2ae973903e2408662a
-size 55904
+oid sha256:7a3667390d9d88894bbdd5d72b0b714b29c9ff160653e310e97b0da87b6ba8b0
+size 54724
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png
index bd3b0196d6..0f6de1b844 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f7f7415abbe51858f938e16ad03c6aab983fb3d5e2a53a028bae3c031446646
-size 67848
+oid sha256:28512b0fda0b71b98eab03cee15c9d3163825b1a3545670cfa277ddd5434c87a
+size 58417
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en.png
index f4d51ccc61..6c774d4cec 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a8f5aaaa7ebb0e61b07867590d99a8791c5d04cad1ce0f334d23dce6f26c6e6
-size 67276
+oid sha256:6ed6a5f1a2055e19a6b8fb0af4738845bd2184f755c323022c52154cdfa07e05
+size 60909
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png
index bd73e322ab..02d0fc8eeb 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12020ba97720f2374f9ace172693f08be01522e4ca30d3970efa91d802581e81
-size 3657
+oid sha256:f77d8243c23d3f37dff86dec53671cbde9fafe1314f6e6b445abdfe47d751ad6
+size 56187
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png
index 93622cedfe..bd73e322ab 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87193a7c9eb9d40234970e5f5be02e80f2b3ffe91e2c9ca6afd58b8bccdd5911
-size 55075
+oid sha256:12020ba97720f2374f9ace172693f08be01522e4ca30d3970efa91d802581e81
+size 3657
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png
index bd73e322ab..0cf6c10c4e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12020ba97720f2374f9ace172693f08be01522e4ca30d3970efa91d802581e81
-size 3657
+oid sha256:49f0bb16d3d57b59242e704e3dd4e8885c59721a42129837ff6a4f0d7d02de11
+size 54433
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png
index bd73e322ab..adec213a8c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12020ba97720f2374f9ace172693f08be01522e4ca30d3970efa91d802581e81
-size 3657
+oid sha256:8ebee4aec3dbab6e1bb05fda7c5e423f0e931560743d0f0ccbac6b70fa9ad808
+size 52921
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_en.png
index 0ab00359b7..12bd190dd1 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b5e6f4c5ec97e67bb20f03f25f18d9f32d5d1aed5ff30d161b331894ad03443
-size 647384
+oid sha256:ce15ca9f89274620728715e3448ce671e2253f4fed22a44035460e9a3709ca0b
+size 647404
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Night_0_en.png
index 0ccdcbb603..160d58f9ec 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0424685437a433b35b589668b409d55f26ab41bcae01af0121a54033c56a8c2
-size 646194
+oid sha256:c4e7b28b78cfbcbb6abf00317eea945859ac6465cecf81a3ad15801b0de721e4
+size 646216
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en.png
index ab6392a424..0435f55de6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94f89a37549a3f198442db467bc7d8539f0b5649d97927bfe731f090d6dfb03d
-size 379505
+oid sha256:ff839731834d7d0c94fa9a2c412014ddbaeaa053c5af1c8cbd00a3f3a583f364
+size 379511
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en.png
index f0b5506b89..9cbd5c1d95 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04ea6c2947a21d3d4a3d43e9c4750c4f2a49056536a4da3f34c95df8353e9de3
-size 377990
+oid sha256:d0e170b4bea262de612bf3374d475fcd25470ff91b7554d20809c51857a78cec
+size 377963
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en.png
index 3ac59caeea..1f0fdabe6d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a94d5198e27338675c0e15df5874ba3272ee315b8d77291dc7ccc7c754ed1f4
-size 365082
+oid sha256:b8bb5a6de6601da8d7fe59f110a054577e2e25dae4bb449f60c04e7d7a1b9551
+size 365073
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en.png
index 195aa04fe2..86018764ac 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76e5ae44362792d570cd82f3910c8bd0acde509b8418c5892e0385e7d636f042
-size 370223
+oid sha256:8344427a0fe87cbf0883ff53a9ee4dcf90976a7011f6618d85961df48b2c53a9
+size 370228
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en.png
index 29771235f0..058a3992c3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60b9f2b920cd2a2a414805d1f0f77925232d9ae60bd607fa18d4395cda2dd73d
-size 363291
+oid sha256:00fe1e676086766a3eac3e4457eff52c989789fc5d8d0df2624c019ed25ce9af
+size 363322
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en.png
index db4ea8296a..c6d4541184 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f0d24b8011564ee7a8b2f8c2e6a24eda668ee42d451d862f884acb7926aa06c
-size 368529
+oid sha256:c00e504593d8eb61b598f05f46ee4d591757975a80c0b4227b240847d2cd4868
+size 368510
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en.png
index 94428abb56..84d9d4e5c3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36d7cf2510d546d2b330b1d1b1674ce58df0558c547e443794a1e7b2222add87
-size 347897
+oid sha256:7c609a633ab23eae5729ecb57a17a385bac65e81cbf0180c01e0847f1028039e
+size 347890
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en.png
index 5400a98a50..40fa5d563f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:40a23ddff1fe46a486a5d34d94e0e67ec14d0b2b9c6bee2ddbadc17ce0948b7b
-size 367131
+oid sha256:3ff97eb99daf65f74b469d51b93bd77d304d0c780b9406e1c4d7893b71e3c68d
+size 367163
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en.png
index 22ff4965d1..bac23aab98 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:787151f8f242a8794a804bf14831f6ca680814d617e85feb3652103e8a0f20cd
-size 346565
+oid sha256:e30686c7c037ef102717e0316543faf4d3ed2671c21eca96a667150daab380d6
+size 346614
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en.png
index c3b6a086fe..2348755afd 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e615c14cd23f3efd217ec20ce05ed32be76dc3317091e8221f1a72a5a594d92
-size 364175
+oid sha256:e907f67ef884edb61df187f0f229ed4ff4cb31f8c276f807698f861c0e7a4c27
+size 364124
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en.png
index 67490ba700..01d4dca84b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4431e2d9f30123949ea5676ce60f642234adcf9b5a33f2acc3f80ebf6609a66
-size 369730
+oid sha256:ef2bf449671b652cb152b3baab92ab100eab77a54229ab49daeab156f2f484d0
+size 369724
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en.png
index 1600afff71..f0dfbc3321 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:273351cc9c533b2424859a0de00a8a3786628abc3a88175705c4205dedf7e9aa
-size 354737
+oid sha256:f7a6302320bd1e4258e03487539bf46b0b12781dfc8a22b3f9f267017a6146fa
+size 354751
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en.png
index c4943b892c..e38cf03ad6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c410e853089cc2c4a2c48a00dd9a8babc8095aed72bb4625057444710559c6c
-size 368129
+oid sha256:41a0e404dea7f52359b24b3ec3926b1405429b165cfed44c63b3922ea6d3cb46
+size 368114
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en.png
index b5dac8434c..68f8148879 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a92f8af94682facac66d4aacb6e49f345561c15be2f8b689041b78aeaaae831
-size 345062
+oid sha256:6ca8cf82aa8ab1bdad56a27584b27789402aeb7ad8fadd038280a376fb75a72c
+size 345094
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en.png
index 1b99468924..8aa2cca147 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a9509411777f342261cab58b92a022b3c9f8f0f7a9e4d0527120a91976575f0
-size 357733
+oid sha256:02ecb903124273e24151ea2088f6b99144f7dcadba00a582b6210dd23835b5c9
+size 357743
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en.png
index cececc229a..b5032c29b3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0c6dafaa41849af00d5097a85bd88e3a054a0a9e41c0466a08e6ff8dd6102b2
-size 356857
+oid sha256:dce23463c335d01eb67293cfcede5d85e96ab2ba035cc9a188d42e8e6866bc63
+size 356831
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en.png
index 14a40a5676..a332744358 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a11044fe90227f1f316a1ade8587e545bb620e11cca76865fc2eb83cdb817fc5
-size 364655
+oid sha256:588967869cbd25ed8b82aff5618175660a8a9e45a5a861b1c7867cf1913f575b
+size 364646
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en.png
index d7b969fd5b..133fd3903f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2528df873713755f542f61cd794080929586c1bd5f316c0378ce9e837c21d50b
-size 397145
+oid sha256:426d1c844a8c88281c5fa4c61916d93278fdfd38f8cdf2dc54bf1a821f2de3eb
+size 397167
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en.png
index 63bd9c3f6d..0041a870b9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6cd94664f89bdad2a9761ea8b20acb83fed3ed7cb5be41af8fe4852643c0bfc
-size 356175
+oid sha256:a2bd77c08be705c66225f16c29fd6826decd92b41922d0f8ffc0d1a63d8c59d2
+size 356193
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en.png
index 9fcf389708..f67906a37c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9daeee1aaa04247da3c8bb5aaae9947aab1ed2d2057995e53d6ebdb63e5cd356
-size 355848
+oid sha256:ffa68c8398d789444151855496e5df4ffa03218a383db6ea46fd4f979829b823
+size 355831
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en.png
index d235670def..6e83d6491d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a00bd766a00b7e7c6615fc53bf469b3ca5056a6c514c096431ae38d99d604306
-size 364845
+oid sha256:34152c742abc486a48234e22101833bc163cf11979890d06aac41e68e3c404d0
+size 364846
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en.png
index 0021619c44..b10f9741b9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b23d3a37774283067a8919b8c332b1bb5a79e90dceb7216b484b985491282e5
-size 355389
+oid sha256:3ec1b0244dab22414c6719b3309426e13128d0c70fb67dc66cd8a60d42521fd0
+size 355411
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en.png
index 422c324695..77abe20982 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1df8d22766981fc76d6d767dc3f40d98cadc7c51be20417b067b91af604232b
-size 367884
+oid sha256:5c3d87862c6d7fc88d0f23cd54c5b9f77028992fdd7c282a195b964dd17e85ac
+size 367855
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en.png
index 448bcec677..1d34761a9b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe0daf9161bc2da194992a2fc9505bf2009c5dbed78cdb35d2eb7ed1380a7df5
-size 353037
+oid sha256:f7d9b5fc0ff5d7828ad6f4dc0c9bd9520b4920553da97ed7b4e030ee844c0208
+size 353054
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en.png
index c081fa16a5..5243218ae3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a92bcf5885322e11a706071969fb674b1f6e60e021af153aaa125baa4a602ae
-size 366285
+oid sha256:9a85db2f5958db867578663533f204b2e803372d470da890fd8056ffed0cf46c
+size 366254
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en.png
index 47a9a6b630..b6d1f07279 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54372845e922d047408dd960d048b9b5eae2263d589117d8e7d197741aa34f32
-size 342827
+oid sha256:4bee12a6bdb18fea5ac6997671bfcb903296da7278cf69b2456330066ca31dfb
+size 342870
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en.png
index 5560c21967..ceca184bd7 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af4a48ee80535f2c0a226c4ffa4344054fb63b7b0a88ea2c030a4eb8dd5e9644
-size 356078
+oid sha256:8e82011a72f36889c53ab61ed2b9947c7fb5f868c9b7010904fc10f4ca587082
+size 356082
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en.png
index 5cc5cfe4fc..5cdad1df92 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6524cc87257cc9d3f135904f4e14594b56df695e71fe576418d2319c472d710b
-size 355285
+oid sha256:9e2d8caf5aaae7d3406c703288e491f328552f0acd18e56afd5265b4ceaf1cd1
+size 355272
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en.png
index e9d85990e8..a431a9429a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66d4b6ea4a697735bbb0fac936b89cde99c5077973ba828894bf50b5dae233b3
-size 362848
+oid sha256:93c2df04d65f6078ce3f7067fbae8a7317ec42ed0fc013dee962a3953269f3b7
+size 362813
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en.png
index b51a89586b..0eb106f4a9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e642229c58169775fe702769a306bbef22698516ae6f7ac75a761213c3f195fa
-size 395446
+oid sha256:217ac95bf476c53d2dc6d3d0143b21312bf38b8ab86c8dfd4f9360582b584f9d
+size 395476
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en.png
index aa322fc2e4..ae8495618a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5fae87094ea13b14e2dc7c16ca96e4f8096ff39e962799468fb4ead4c666620f
-size 354381
+oid sha256:08057fdc1e1184720b438ddd2a8753f00791baf2456cc30b45de8e6bdeb57e8e
+size 354404
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en.png
index 40105c1498..9d617f6688 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ed24d190f10c079f8cf176404372d40eb25cc78ce595a22febc540315057b86
-size 354075
+oid sha256:dabad9dcd5b8f0d4bb964a0187ad7c94b023b04552dacd29a077daddfd48d550
+size 354052
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en.png
index 0cfd1dc985..1a8ea3e4e9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:545c9e8933e420cc3f8fbba0fbd5162c946c65a20721faeb77c568596ca720cd
-size 363045
+oid sha256:66aba7b4271a990fac85b0bbc7cbdc371fa1e38a4da5bb4e2f62a80b21cb3a8f
+size 363012
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en.png
index c9227ebf94..c8306263a0 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e614f4a8657637c584a283d69124236d00fe1251c2b8d739c5688a57a6fd152e
-size 353693
+oid sha256:756f0cff90ddd61adce2f467c0384d74d430f6d51c091e4980e45bcc9ee6f0fd
+size 353705
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_0_en.png
index 144411969f..7a5e5e1512 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84415250503d5e586af7b7504aaa915c1e24dec0a3d28446487c474c354e05c9
-size 55534
+oid sha256:0e3467a7606a5a7beaafb510faf008ed567b1e3a9915ede6e2ec09c491af0bb9
+size 56552
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_10_en.png
index 52e023ec49..843adcdff0 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8420417cf8ba717747dead34b9646515f35eb94e1f71aa952b77c3ff433043e
-size 49684
+oid sha256:446ae29cbb211665f6d91129a7dee0f718b407fcb2a64d3f2c0e962e1cb47af7
+size 50168
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_11_en.png
index adabb6dde5..ee23a7111d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b071ba6e99b68dcc75f5aaed3a879f2e30614c954b88c6dc05e1dfec57f1079
-size 65771
+oid sha256:38ae233a128e887efc48da73be3d6ce50a7095601315ed49a3c9cb209ffdda26
+size 58352
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_12_en.png
index b2e29b6c25..0a41aba67c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b68f247755ed20b6c597099c377d87ce57ad6131f57a641223c248ea04f8f1a6
-size 52141
+oid sha256:9427e90f0865c7427006a73af5b64a799dee8ef9873994b44471e3494d156afb
+size 53265
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_1_en.png
index 6c2a7e8460..2a5991cf59 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:984536295516b542ec6aecf7d07baa3c6dfebbc66403b6d4258a6217616cec93
-size 39991
+oid sha256:115c725873fb206d8f732a8297a6548ba4fa45d7328196b79a2d9e35545de7d5
+size 40347
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_2_en.png
index a1dc68a3d5..7ce91f4684 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:871d92a7565dd233ea87d53658be4e5202775def8e17fea8d386b8975c3b065e
-size 53868
+oid sha256:7b749e1260d6ba2b7fef5ae9efd58612f6d67d1788f6c1e5cebc22d58d0fd7b7
+size 58563
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_3_en.png
index 479d07ae5f..f6456f0ec1 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d4f03ac10bbb676d272dba906e758b25d633a1da1e249fe23ba825f8d2f4901
-size 55298
+oid sha256:22153168f6f3e84ab789faea29c94fffbc1a5e4c1b9a98deccb0460192fdde23
+size 57213
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_4_en.png
index c90dc8d08f..6a3ffb84b6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e48a364a28a67d7d090faa23ef88b27dbd47f0a2f552857490728cb6952ce08b
-size 53454
+oid sha256:48b91e52306daa750b4b5792535e1f1865ae3b74a36215376a51dafdd0dcd506
+size 54837
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_5_en.png
index 6c0a7b4edc..abf8eb7086 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f5aa22c3d79a392625ae231abc046f07f7cdabd91613d5e6f07aede5382aba9b
-size 60410
+oid sha256:1e79e1cc59ba62ca8eb99300eb520b05d7ac6d52c077e3010c03b474865b15f4
+size 58374
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_6_en.png
index ac1d94a4dd..5d4f5bdaeb 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be5b086ab6934bae88b39987bc51e709c5adb81bdd04fa028e97832c725fd68a
-size 50219
+oid sha256:08fb14008b08d86755c3473e7194ef0a39bb73c3f0d48122ca80c6a019ec98eb
+size 48676
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_7_en.png
index 2209fcb54f..b3af9d831a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd0de7412503e93c33cf92dde0cff38bb68555ef176080d913320af5e4942e7a
-size 58642
+oid sha256:ce795c4e32a1be3d57f6b1c87588d8c7ed0442996ab9d8a96f1ec5a07627e598
+size 59663
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_8_en.png
index 82ef5e7d6a..2c88d322d4 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:41c4bd5cd1bcbedd91de0a64967fb3f3e03b5f0937ae1ea1a93a7c4a1b24a4a0
-size 56262
+oid sha256:963fcec9647d0e5e57bd3fbe3edd389c17be7558c1da7e93fa44f34db34307ee
+size 57726
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_9_en.png
index 135d84dd90..281aad62a7 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ff538a81d013fdc90dd7be466f710088eea93e081d23448b0731d301a4a3bb2
-size 60702
+oid sha256:85f6f4c64f67faa99b9af65307a0cd3b46a68db52503c9c929375408597995d9
+size 62094
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_0_en.png
index cfa6e4dbc3..89fc6708d2 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a3281f35461edb900ea434c68543dc684a5fad7dab7c9aabac510bc59d442b3
-size 56479
+oid sha256:89467c5b84d0a15210d4013013598d9994d3005a2299e44583d78355e6718ad8
+size 55538
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_10_en.png
index 5f3a619097..17df34a50a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19d14e3d779b163053c28e66d3381f0cabe3b540744606e955cd733f9e044089
-size 51713
+oid sha256:6548f5bf1906e1dddcbcc03bb8f76b42e604075751ea8efbc3ead826bf4cfad7
+size 51258
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_11_en.png
index b3109663f2..6e8468054f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10bce6df962a5198f019f509b1cdb55e28195587de4b74742ddc29833f1333a4
-size 69216
+oid sha256:262e8d4b8daa2d25593834fd0ab5d7019b0a3dd13707aa96e0701bf9240c6525
+size 59809
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_12_en.png
index b46bcd0a0e..350c877e8a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e3e355c5d274b11f973d624ee3c3a275bf7d6c45f390fef3228b2e32de91e35
-size 48480
+oid sha256:1d910cdbd02c49ef5decf23e3a804d15be047522f6260505bc696b856379891a
+size 47310
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_1_en.png
index 1ff5ace3e3..b32ee34f99 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d875f83a3a1977e2a2cf151dcf9d731108a8590eb3643eb057727421eb1e955
-size 38812
+oid sha256:bde66c53d81f882cde9ed527e8ff82c7e9d6cb1199b440d4b721659f7189bb42
+size 38906
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_2_en.png
index f4ab74029b..f425dd2c4c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:51a5b682243b969bc2d7d609decb823b0509d240f3ff14ee78319260af76a47f
-size 58740
+oid sha256:bd6dc088e16f722b36c2198d6a8611af87dec2451f94ca3c2b6880b97f709b98
+size 54095
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_3_en.png
index b0cd5bc6d4..3974618f39 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e900ff75d02c9db4200e2032444dd7e2f8635973cca3389dd96d7d2bb734061
-size 50757
+oid sha256:718d5c9f24c114f3bf88e000b637ea19598d7bb9b97001ba137fc12a6a1285e4
+size 52608
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_4_en.png
index 0ad1e67deb..486d5da5c6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82e6e38576a507b19e58fce9dda0734ec00bcedcb0baf8f4c7919dbaaf7d2b85
-size 55046
+oid sha256:e482603e6d03fffb57d4eb135edb6209c748c51b1f07e638a4ccf133b1b87a79
+size 52920
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_5_en.png
index 5a877a59e1..a009d0f584 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a582219d3143acb08563193bf7106e1ee8f6612e359d0a192e9a2f67c6799e3
-size 55375
+oid sha256:478851e9e2e8c80095aa552b98a5d574749200ff49899c9472c913b07459c4b5
+size 53758
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png
index f82a7a8219..0383bb8f95 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22ea7fe121a63b35a2c2bb47609e692f8bf2b913871a6baf3d420c04334c6c4a
-size 44344
+oid sha256:7c88b3ed8cc69dee59d4d0a726a9e383d00f2815b6525315f7dcd96f9c25ec2a
+size 45618
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_7_en.png
index 952751a962..7261c9b671 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed13a2778b8ced86ee41d5460d274b42b714a87f59749e3b26bf75114ef40dd9
-size 58265
+oid sha256:7cf3d727da78b39ecf24d4df7db0884af9008db67cc92274849c1b0978f87726
+size 59252
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_8_en.png
index cfa62a6626..0f7fe2db38 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bfe848e4c365cf4b4d663145f74e5f8b3f47a4c8994961c530603f0248400316
-size 57117
+oid sha256:a576d52b840730334a38046cf8b57993693fc760b4fbdc00376cb48b7268d76e
+size 55890
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_9_en.png
index 4d6afdbbb1..89065e6bf0 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35069d4fae829d9afe479308dd72ad025fa011290d23133a231f4e70f601ee75
-size 62987
+oid sha256:a966c9a1fa4fdd933f4ef9239592e90458a2819ff4a45c857714d2e38c0df5b2
+size 64405
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en.png
index 7cca911c45..074820e157 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26e14b77fa3c3aeaea58782309e6de8b9047e07945009322990ebf5f4c283309
-size 52770
+oid sha256:7caacb336793b8ae4b83e9a10a82325e25e8b3c036f881898ed28688250eb6e0
+size 55744
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en.png
index 2af459c158..7cca911c45 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28a95d4b7ebca92c4e0467f3ecd9acdaf7f6257604d190f5d088a9a25e87d637
-size 55305
+oid sha256:26e14b77fa3c3aeaea58782309e6de8b9047e07945009322990ebf5f4c283309
+size 52770
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en.png
index 616c06bf46..a68f886f73 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ce2519906f1aaf34700ca9ba4bdeaa72030f1f5aff3f7e24352a1435ac67d98
-size 53966
+oid sha256:e5a2e306087a967849f61872b56a83f194d1a76df5723f0bbae6e6e2f4a98c63
+size 55725
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en.png
index 616c06bf46..36d19c6b72 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ce2519906f1aaf34700ca9ba4bdeaa72030f1f5aff3f7e24352a1435ac67d98
-size 53966
+oid sha256:7dfa2767c55a81d3f121b8fa55443b7b05f9369e91639b80e0be349863799ad7
+size 55438
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_5_en.png
index 82f344f714..2c15fd6a37 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d96eefa01a5de803b0cc9d9109c20df86eaff01b73ff24a91945b43d53d5d01
-size 11960
+oid sha256:7260abe16fc2ab4f6ada97ea0f756dc5c9908ff3b61d6ec1723ffde302bb3dc5
+size 11955
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_6_en.png
index fdd8fcd5a5..7c422591ad 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22678a2a8505e1d9d5bfcb44459b6fac69c11a4bf72fae09c48ffa2e54f5a110
-size 12128
+oid sha256:2e16fc1daa0f284c442f66591e1d1f59161272a67998d26740b0b403bfe82495
+size 11866
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_5_en.png
index f6e27475da..acb8afa74a 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ee89826c8aa2ac0371ed31959243f62bf9968806a7b27117cd7b4d849423a33
-size 11667
+oid sha256:bed7565420e11c43acc06896ef298683d2f2dd1dc16c430eab7018e9ead9937a
+size 11652
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_6_en.png
index b1bb69efb8..e0a4cb1c97 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e27cb9e501ccbac54926f0252b4098867643a2d2683c5b267f86ad99edf6f5d7
-size 11817
+oid sha256:87811df502c760816e74beb006341627857c39380ce715f1a747ac9fce77b226
+size 11516
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en.png
index 73b8b8e50c..5c597300e4 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8a3ad99763929d2783147814e44fa9ec7e7efb7b99949e3580f23c38fb5d971
-size 9398
+oid sha256:21aee17ee9a292bb2f0d3d2ec2db565ebb8d5df753454a5a002f033ed5ed39c5
+size 3853
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en.png
index 5c597300e4..f8a1f24b34 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21aee17ee9a292bb2f0d3d2ec2db565ebb8d5df753454a5a002f033ed5ed39c5
-size 3853
+oid sha256:1342b6427f5b2e3075ae3ccee60bf1d3b11afaccf3e152643d6ef2d65c21b54e
+size 9108
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en.png
index d47bf90664..4ae7279fe7 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:520cae2544153ba45f8fe4b021286c2d22da06aa1b60be7f1b13879723ff994c
-size 3664
+oid sha256:410a8596d4c70b9a3856d959d6d71ade8e831e8581ff410c9900957a93b3eb50
+size 8114
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en.png
index a87d89c701..d47bf90664 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f3a0cb5d9bae6725a1c527f3d9575aabf85d3edf63a28d9faa23f4f0b65e2d0
-size 7624
+oid sha256:520cae2544153ba45f8fe4b021286c2d22da06aa1b60be7f1b13879723ff994c
+size 3664
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png
index ee5c582240..58546b8522 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75de341f705bb22955f9399180519b65ad59c2e1917317d56e50ea4db78f35bc
-size 12102
+oid sha256:30357bf18792db5ab20085010251170a724ffe8c00313facd04ee704e806af64
+size 10982
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en.png
index 52fd9b9693..fedead0fa8 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58b9491aaa5554b89d86c62a5c9c44975367538c6baa5562f8dc5768f76d8264
-size 8705
+oid sha256:4811667dec0f32accc5e2c8a5dd5c0b34017fcff8d1e0376ee7a4708426bca0f
+size 9838
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en.png
index 38ad0e4b56..83302d6ba4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:326d59cf768b2dbd96eb7964d54c8eda509a5cd57c6e62087625e3314da0bb4d
-size 13658
+oid sha256:16dee1dfe746cd40dac9fe8f0af3ecb42cd14bab5cc490917b589beed065ed1b
+size 14686
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png
index 687e0d436a..4da2a98aca 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d57df7110371c9224e232b707d6a1b10ce14afcb56c803a78220792f2a0d4cf2
-size 11354
+oid sha256:ef0dc4d53daeb986f378b6e4d85928b4b6729336c89cf21e642c88c53688a3ab
+size 10292

From 2ab3c7ec5368e563fbec5b5e3c86a2d6433980e0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 23 Sep 2026 10:28:33 +0000
Subject: [PATCH 13/20] Update media3 to v1.11.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 54902a7b3b..5a7a31cbf2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@ constraintlayout = "2.2.2"
 constraintlayout_compose = "1.1.2"
 lifecycle = "2.11.0"
 activity = "1.13.0"
-media3 = "1.11.0"
+media3 = "1.11.1"
 camera = "1.6.2"
 work = "2.11.2"
 

From 4fa98752d49c900bc0523c30ce15609dc888c9d0 Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Wed, 23 Sep 2026 12:42:57 +0200
Subject: [PATCH 14/20] Add a script to install and launch an APK given a PR
 URL (#7752)

* Add a script to install and launch an APK given a PR URL

This is easier than manually downloading, then installing the APK or scanning the QR code using the device

* Allow fetching the APK using the PR number too
---
 tools/diawi/install_pr_build.py | 237 ++++++++++++++++++++++++++++++++
 1 file changed, 237 insertions(+)
 create mode 100755 tools/diawi/install_pr_build.py

diff --git a/tools/diawi/install_pr_build.py b/tools/diawi/install_pr_build.py
new file mode 100755
index 0000000000..32f250ceed
--- /dev/null
+++ b/tools/diawi/install_pr_build.py
@@ -0,0 +1,237 @@
+#!/usr/bin/env python3
+"""
+Install the Diawi build attached to a GitHub PR onto a connected Android device.
+
+Usage:
+    ./install_pr_build.py https://github.com/element-hq/element-x-android/pull/7750
+    ./install_pr_build.py <pr_url> --serial emulator-5554 --replace
+
+Steps:
+  1. Reads the PR description and comments through the GitHub API and finds the
+     most recent link of the form https://i.diawi.com/<build_id>.
+  2. Scrapes the Diawi page and finds the link labeled "Download application".
+  3. Downloads the APK.
+  4. Runs `adb install <apk_path>`.
+
+Set GITHUB_TOKEN in the environment to avoid GitHub's anonymous rate limit
+(60 requests/hour). Only the Python standard library is used.
+"""
+
+import argparse
+import json
+import os
+import re
+import shutil
+import subprocess
+import sys
+import tempfile
+import urllib.error
+import urllib.request
+from html.parser import HTMLParser
+from urllib.parse import urljoin
+
+PR_URL_RE = re.compile(r"https?://github\.com/([^/]+)/([^/]+)/pull/(\d+)")
+DIAWI_RE = re.compile(r"https://i\.diawi\.com/([A-Za-z0-9]+)")
+DOWNLOAD_LABEL = "download application"
+USER_AGENT = (
+    "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 "
+    "(KHTML, like Gecko) Chrome/128.0 Safari/537.36"
+)
+
+
+def die(msg: str) -> None:
+    print(f"error: {msg}", file=sys.stderr)
+    sys.exit(1)
+
+
+def http_get(url: str, headers: dict | None = None) -> urllib.request.addinfourl:
+    req = urllib.request.Request(url, headers={"User-Agent": USER_AGENT, **(headers or {})})
+    try:
+        return urllib.request.urlopen(req, timeout=60)
+    except urllib.error.HTTPError as e:
+        die(f"HTTP {e.code} while fetching {url}")
+    except urllib.error.URLError as e:
+        die(f"could not reach {url}: {e.reason}")
+
+
+# --------------------------------------------------------------------------- #
+# 1. Find the Diawi link in the PR
+# --------------------------------------------------------------------------- #
+def github_json(url: str):
+    headers = {"Accept": "application/vnd.github+json"}
+    token = os.environ.get("GITHUB_TOKEN")
+    if token:
+        headers["Authorization"] = f"Bearer {token}"
+    with http_get(url, headers) as resp:
+        return json.load(resp), resp.headers.get("Link", "")
+
+
+def find_diawi_link(pr_url: str) -> str:
+    m = PR_URL_RE.match(pr_url)
+    if not m:
+        die(f"not a GitHub PR URL: {pr_url}")
+    owner, repo, number = m.groups()
+    api = f"https://api.github.com/repos/{owner}/{repo}"
+
+    texts = []
+    pr, _ = github_json(f"{api}/pulls/{number}")
+    texts.append(pr.get("body") or "")
+
+    # Comments are returned oldest first; follow pagination to get them all.
+    url = f"{api}/issues/{number}/comments?per_page=100"
+    while url:
+        comments, link_header = github_json(url)
+        texts.extend(c.get("body") or "" for c in comments)
+        nxt = re.search(r'<([^>]+)>;\s*rel="next"', link_header)
+        url = nxt.group(1) if nxt else None
+
+    links = [f"https://i.diawi.com/{bid}" for t in texts for bid in DIAWI_RE.findall(t)]
+    if not links:
+        die("no https://i.diawi.com/<build_id> link found in the PR")
+    return links[-1]  # most recent one
+
+
+# --------------------------------------------------------------------------- #
+# 2. Scrape the Diawi page for the "Download application" link
+# --------------------------------------------------------------------------- #
+class LinkCollector(HTMLParser):
+    """Collects (href, visible text) for every <a> tag."""
+
+    def __init__(self):
+        super().__init__()
+        self.links: list[tuple[str, str]] = []
+        self._href: str | None = None
+        self._text: list[str] = []
+
+    def handle_starttag(self, tag, attrs):
+        if tag == "a":
+            self._href = dict(attrs).get("href")
+            self._text = []
+
+    def handle_data(self, data):
+        if self._href is not None:
+            self._text.append(data)
+
+    def handle_endtag(self, tag):
+        if tag == "a" and self._href is not None:
+            text = " ".join("".join(self._text).split())
+            self.links.append((self._href, text))
+            self._href = None
+
+
+def find_apk_url(diawi_url: str) -> str:
+    with http_get(diawi_url) as resp:
+        html = resp.read().decode(resp.headers.get_content_charset() or "utf-8", "replace")
+
+    parser = LinkCollector()
+    parser.feed(html)
+
+    for href, text in parser.links:
+        if href and DOWNLOAD_LABEL in text.lower():
+            return urljoin(diawi_url, href)
+
+    # Fallback: anything that looks like a direct APK link.
+    for href, _ in parser.links:
+        if href and ".apk" in href.lower():
+            return urljoin(diawi_url, href)
+
+    die(f"no 'Download application' link found on {diawi_url} "
+        "(the build may have expired)")
+
+
+# --------------------------------------------------------------------------- #
+# 3. Download the APK
+# --------------------------------------------------------------------------- #
+def download(url: str, dest: str) -> None:
+    with http_get(url) as resp, open(dest, "wb") as out:
+        total = int(resp.headers.get("Content-Length") or 0)
+        done = 0
+        while chunk := resp.read(1 << 16):
+            out.write(chunk)
+            done += len(chunk)
+            if total:
+                print(f"\r  {done * 100 // total:3d}%  {done / 1e6:.1f} MB", end="", flush=True)
+    print()
+
+    with open(dest, "rb") as f:
+        if f.read(2) != b"PK":  # APKs are zip archives
+            die("downloaded file is not an APK (Diawi may have returned an HTML page)")
+
+
+# --------------------------------------------------------------------------- #
+# 4. Install with adb
+# --------------------------------------------------------------------------- #
+def adb_install(apk: str, serial: str | None, replace: bool) -> int:
+    if not shutil.which("adb"):
+        die("adb not found in PATH")
+    adb = ["adb"] + (["-s", serial] if serial else [])
+
+    devices = subprocess.run(["adb", "devices"], capture_output=True, text=True).stdout
+    attached = [l for l in devices.splitlines()[1:] if l.strip().endswith("device")]
+    if not attached:
+        die("no Android device connected (check `adb devices`)")
+
+    cmd = adb + ["install"] + (["-r"] if replace else []) + [apk]
+    print("Running:", " ".join(cmd))
+    return subprocess.run(cmd).returncode
+
+def adb_launch(serial: str | None) -> int:
+    if not shutil.which("adb"):
+        die("adb not found in PATH")
+    adb = ["adb"] + (["-s", serial] if serial else [])
+
+    devices = subprocess.run(["adb", "devices"], capture_output=True, text=True).stdout
+    attached = [l for l in devices.splitlines()[1:] if l.strip().endswith("device")]
+    if not attached:
+        die("no Android device connected (check `adb devices`)")
+
+    cmd = adb + ["shell", "am", "start", "-n", "io.element.android.x.debug/io.element.android.x.MainActivity"]
+
+    print("Running:", " ".join(cmd))
+    return subprocess.run(cmd).returncode
+
+def main() -> None:
+    ap = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
+    ap.add_argument("pr_url", help="GitHub PR URL or PR number (e.g. 7750)")
+    ap.add_argument("-s", "--serial", help="device serial, if several devices are connected")
+    ap.add_argument("-r", "--replace", action="store_true", help="pass -r to adb install (reinstall, keep data)")
+    ap.add_argument("-o", "--output", help="where to save the APK (default: temp dir, deleted afterwards)")
+    args = ap.parse_args()
+
+    if args.pr_url.isdigit():
+        pr_url = f"https://github.com/element-hq/element-x-android/pull/{args.pr_url}"
+    else:
+        pr_url = args.pr_url
+    print(f"Looking for a Diawi link in {pr_url} ...")
+    diawi_url = find_diawi_link(pr_url)
+    print(f"Found: {diawi_url}")
+
+    apk_url = find_apk_url(diawi_url)
+    print(f"APK link: {apk_url}")
+
+    build_id = diawi_url.rsplit("/", 1)[-1]
+    if args.output:
+        apk_path = args.output
+        tmpdir = None
+    else:
+        tmpdir = tempfile.mkdtemp(prefix="diawi-")
+        apk_path = os.path.join(tmpdir, f"{build_id}.apk")
+
+    print(f"Downloading to {apk_path} ...")
+    try:
+        download(apk_url, apk_path)
+        if adb_install(apk_path, args.serial, args.replace) == 0:
+            print("Installed successfully.")
+        else:
+            die("adb install failed.")
+        if adb_launch(args.serial) == 0:
+            print("Launched successfully.")
+        else:
+            die("adb launch failed.")
+    finally:
+        if tmpdir:
+            shutil.rmtree(tmpdir, ignore_errors=True)
+
+
+if __name__ == "__main__":
+    main()

From fb84c5b3c0d00564e1b8f26912f5f7b7e94c550d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 23 Sep 2026 13:02:58 +0200
Subject: [PATCH 15/20] Update dependencyAnalysis to v3.19.2 (#7755)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 54902a7b3b..3f38680b3a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -49,7 +49,7 @@ haze = "1.7.2"
 maplibre-compose = "0.15.0"
 
 # Dependency analysis
-dependencyAnalysis = "3.19.1"
+dependencyAnalysis = "3.19.2"
 
 # DI
 metro = "1.4.3"

From 3cafaaec946a4142efcfaa451fb465e296eb1ed7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 23 Sep 2026 14:25:37 +0200
Subject: [PATCH 16/20] Update remove message confirmation dialog. Closes #7753

---
 .../element/android/features/messages/impl/MessagesView.kt  | 3 +--
 .../messages/impl/src/main/res/values-de/translations.xml   | 2 --
 .../messages/impl/src/main/res/values-fi/translations.xml   | 2 --
 .../messages/impl/src/main/res/values-hr/translations.xml   | 2 --
 .../messages/impl/src/main/res/values-hu/translations.xml   | 2 --
 .../messages/impl/src/main/res/values-ja/translations.xml   | 2 --
 .../messages/impl/src/main/res/values-pl/translations.xml   | 2 --
 .../messages/impl/src/main/res/values-ru/translations.xml   | 2 --
 .../messages/impl/src/main/res/values-uk/translations.xml   | 2 --
 .../messages/impl/src/main/res/values-zh/translations.xml   | 2 --
 features/messages/impl/src/main/res/values/localazy.xml     | 6 ++----
 11 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
index af8197c8c0..f3ece96c2e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
@@ -460,8 +460,7 @@ fun MessagesView(
     if (state.redactEventAction is MessagesState.ConfirmingRedaction) {
         TextFieldDialog(
             title = stringResource(R.string.screen_room_confirm_removal_title),
-            content = stringResource(R.string.screen_room_confirm_removal_message),
-            placeholder = stringResource(R.string.screen_room_confirm_removal_reason_placeholder_android),
+            placeholder = stringResource(R.string.screen_room_confirm_removal_reason_placeholder),
             supportingText = stringResource(R.string.screen_room_confirm_removal_reason_supporting_text),
             value = null,
             submitText = stringResource(CommonStrings.action_remove),
diff --git a/features/messages/impl/src/main/res/values-de/translations.xml b/features/messages/impl/src/main/res/values-de/translations.xml
index 756512fb1c..1363d2d017 100644
--- a/features/messages/impl/src/main/res/values-de/translations.xml
+++ b/features/messages/impl/src/main/res/values-de/translations.xml
@@ -47,10 +47,8 @@
   <string name="screen_room_attachment_source_location">"Standort teilen"</string>
   <string name="screen_room_attachment_source_poll">"Umfrage"</string>
   <string name="screen_room_attachment_text_formatting">"Textformatierung"</string>
-  <string name="screen_room_confirm_removal_message">"Möchtest du diese Nachricht wirklich entfernen?"</string>
   <string name="screen_room_confirm_removal_reason_label">"Grund (optional)"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"Eingeben …"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"Grund …"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(Optional)"</string>
   <string name="screen_room_confirm_removal_title">"Entfernen bestätigen"</string>
   <string name="screen_room_encrypted_history_banner">"Der Nachrichtenverlauf ist derzeit nicht verfügbar."</string>
diff --git a/features/messages/impl/src/main/res/values-fi/translations.xml b/features/messages/impl/src/main/res/values-fi/translations.xml
index 47dadb7881..3bbc68c356 100644
--- a/features/messages/impl/src/main/res/values-fi/translations.xml
+++ b/features/messages/impl/src/main/res/values-fi/translations.xml
@@ -47,10 +47,8 @@
   <string name="screen_room_attachment_source_location">"Jaa sijainti"</string>
   <string name="screen_room_attachment_source_poll">"Kysely"</string>
   <string name="screen_room_attachment_text_formatting">"Tekstin muotoilu"</string>
-  <string name="screen_room_confirm_removal_message">"Oletko varma, että haluat poistaa tämän viestin?"</string>
   <string name="screen_room_confirm_removal_reason_label">"Syy (valinnainen)"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"Kirjoita…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"Syy…"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(Valinnainen)"</string>
   <string name="screen_room_confirm_removal_title">"Vahvista poistaminen"</string>
   <string name="screen_room_encrypted_history_banner">"Viestihistoria ei ole tällä hetkellä saatavilla"</string>
diff --git a/features/messages/impl/src/main/res/values-hr/translations.xml b/features/messages/impl/src/main/res/values-hr/translations.xml
index 44a389cad5..33daf3b00f 100644
--- a/features/messages/impl/src/main/res/values-hr/translations.xml
+++ b/features/messages/impl/src/main/res/values-hr/translations.xml
@@ -47,10 +47,8 @@
   <string name="screen_room_attachment_source_location">"Dijeli lokaciju"</string>
   <string name="screen_room_attachment_source_poll">"Anketa"</string>
   <string name="screen_room_attachment_text_formatting">"Oblikovanje teksta"</string>
-  <string name="screen_room_confirm_removal_message">"Jeste li sigurni da želite ukloniti ovu poruku?"</string>
   <string name="screen_room_confirm_removal_reason_label">"Razlog (neobavezno)"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"Unesite…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"Razlog"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(Neobavezno)"</string>
   <string name="screen_room_confirm_removal_title">"Potvrdite uklanjanje"</string>
   <string name="screen_room_encrypted_history_banner">"Povijest poruka trenutačno nije dostupna."</string>
diff --git a/features/messages/impl/src/main/res/values-hu/translations.xml b/features/messages/impl/src/main/res/values-hu/translations.xml
index 0c8c5240a7..4befd393b6 100644
--- a/features/messages/impl/src/main/res/values-hu/translations.xml
+++ b/features/messages/impl/src/main/res/values-hu/translations.xml
@@ -47,10 +47,8 @@
   <string name="screen_room_attachment_source_location">"Hely megosztása"</string>
   <string name="screen_room_attachment_source_poll">"Szavazás"</string>
   <string name="screen_room_attachment_text_formatting">"Szövegformázás"</string>
-  <string name="screen_room_confirm_removal_message">"Biztosan eltávolítja ezt az üzenetet?"</string>
   <string name="screen_room_confirm_removal_reason_label">"Ok (nem kötelező)"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"Írja be…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"Ok…"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(Választható)"</string>
   <string name="screen_room_confirm_removal_title">"Eltávolítás megerősítése"</string>
   <string name="screen_room_encrypted_history_banner">"Az üzenetelőzmények jelenleg nem érhetők el."</string>
diff --git a/features/messages/impl/src/main/res/values-ja/translations.xml b/features/messages/impl/src/main/res/values-ja/translations.xml
index 56b5ac67a2..9d2408d051 100644
--- a/features/messages/impl/src/main/res/values-ja/translations.xml
+++ b/features/messages/impl/src/main/res/values-ja/translations.xml
@@ -46,10 +46,8 @@
   <string name="screen_room_attachment_source_location">"場所を共有"</string>
   <string name="screen_room_attachment_source_poll">"投票"</string>
   <string name="screen_room_attachment_text_formatting">"書式設定"</string>
-  <string name="screen_room_confirm_removal_message">"このメッセージを削除しますか？"</string>
   <string name="screen_room_confirm_removal_reason_label">"理由 (任意)"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"入力…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"理由…"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(任意)"</string>
   <string name="screen_room_confirm_removal_title">"削除の確認"</string>
   <string name="screen_room_encrypted_history_banner">"過去のメッセージを現在表示できません。"</string>
diff --git a/features/messages/impl/src/main/res/values-pl/translations.xml b/features/messages/impl/src/main/res/values-pl/translations.xml
index d515a1ee5e..987071163c 100644
--- a/features/messages/impl/src/main/res/values-pl/translations.xml
+++ b/features/messages/impl/src/main/res/values-pl/translations.xml
@@ -48,10 +48,8 @@
   <string name="screen_room_attachment_source_location">"Udostępnij lokalizację"</string>
   <string name="screen_room_attachment_source_poll">"Ankieta"</string>
   <string name="screen_room_attachment_text_formatting">"Formatowanie tekstu"</string>
-  <string name="screen_room_confirm_removal_message">"Czy na pewno chcesz usunąć wiadomość?"</string>
   <string name="screen_room_confirm_removal_reason_label">"Powód (opcjonalne)"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"Powód…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"Powód…"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(Opcjonalne)"</string>
   <string name="screen_room_confirm_removal_title">"Potwierdź usunięcie"</string>
   <string name="screen_room_encrypted_history_banner">"Historia wiadomości jest obecnie niedostępna."</string>
diff --git a/features/messages/impl/src/main/res/values-ru/translations.xml b/features/messages/impl/src/main/res/values-ru/translations.xml
index ebfd45c1fc..1fab6ed5b3 100644
--- a/features/messages/impl/src/main/res/values-ru/translations.xml
+++ b/features/messages/impl/src/main/res/values-ru/translations.xml
@@ -48,10 +48,8 @@
   <string name="screen_room_attachment_source_location">"Поделиться местоположением"</string>
   <string name="screen_room_attachment_source_poll">"Опрос"</string>
   <string name="screen_room_attachment_text_formatting">"Форматирование текста"</string>
-  <string name="screen_room_confirm_removal_message">"Вы уверены, что хотите удалить это сообщение?"</string>
   <string name="screen_room_confirm_removal_reason_label">"Причина (необязательно)"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"Введите…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"Причина…"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(Необязательно)"</string>
   <string name="screen_room_confirm_removal_title">"Подтвердите удаление"</string>
   <string name="screen_room_encrypted_history_banner">"В настоящее время история сообщений недоступна в этой комнате."</string>
diff --git a/features/messages/impl/src/main/res/values-uk/translations.xml b/features/messages/impl/src/main/res/values-uk/translations.xml
index 1ef1f7d969..9c06cb7f47 100644
--- a/features/messages/impl/src/main/res/values-uk/translations.xml
+++ b/features/messages/impl/src/main/res/values-uk/translations.xml
@@ -48,10 +48,8 @@
   <string name="screen_room_attachment_source_location">"Поділитися місцеперебуванням"</string>
   <string name="screen_room_attachment_source_poll">"Опитування"</string>
   <string name="screen_room_attachment_text_formatting">"Форматування тексту"</string>
-  <string name="screen_room_confirm_removal_message">"Ви впевнені, що хочете вилучити це повідомлення?"</string>
   <string name="screen_room_confirm_removal_reason_label">"Причина (необов\'язково)"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"Ввести…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"Причина…"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(Необов\'язково)"</string>
   <string name="screen_room_confirm_removal_title">"Підтвердити вилучення"</string>
   <string name="screen_room_encrypted_history_banner">"Історія повідомлень наразі недоступна."</string>
diff --git a/features/messages/impl/src/main/res/values-zh/translations.xml b/features/messages/impl/src/main/res/values-zh/translations.xml
index 78e0765b22..eaf429be01 100644
--- a/features/messages/impl/src/main/res/values-zh/translations.xml
+++ b/features/messages/impl/src/main/res/values-zh/translations.xml
@@ -46,10 +46,8 @@
   <string name="screen_room_attachment_source_location">"共享位置"</string>
   <string name="screen_room_attachment_source_poll">"投票"</string>
   <string name="screen_room_attachment_text_formatting">"文本格式化"</string>
-  <string name="screen_room_confirm_removal_message">"确定要移除此消息？"</string>
   <string name="screen_room_confirm_removal_reason_label">"理由（可选）"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"输入…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"理由…"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"（可选）"</string>
   <string name="screen_room_confirm_removal_title">"确认移除"</string>
   <string name="screen_room_encrypted_history_banner">"消息历史记录当前不可用。"</string>
diff --git a/features/messages/impl/src/main/res/values/localazy.xml b/features/messages/impl/src/main/res/values/localazy.xml
index 392b90d067..5930725632 100644
--- a/features/messages/impl/src/main/res/values/localazy.xml
+++ b/features/messages/impl/src/main/res/values/localazy.xml
@@ -47,12 +47,10 @@
   <string name="screen_room_attachment_source_location">"Share location"</string>
   <string name="screen_room_attachment_source_poll">"Poll"</string>
   <string name="screen_room_attachment_text_formatting">"Text Formatting"</string>
-  <string name="screen_room_confirm_removal_message">"Are you sure you wish to remove this message?"</string>
   <string name="screen_room_confirm_removal_reason_label">"Reason (optional)"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder">"Enter…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"Reason…"</string>
+  <string name="screen_room_confirm_removal_reason_placeholder">"Enter reason…"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(Optional)"</string>
-  <string name="screen_room_confirm_removal_title">"Confirm removal"</string>
+  <string name="screen_room_confirm_removal_title">"Remove message?"</string>
   <string name="screen_room_encrypted_history_banner">"Message history is currently unavailable."</string>
   <string name="screen_room_encrypted_history_banner_unverified">"Message history is unavailable in this room. Verify this device to see your message history."</string>
   <string name="screen_room_invite_again_alert_message">"Would you like to invite them back?"</string>

From b6cf293e2a16cf0b0067a4491b5160a0c575d75d Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Wed, 23 Sep 2026 14:35:05 +0200
Subject: [PATCH 17/20] Add headers (`h1-h6`) tag support for the new timeline
 renderer (#7754)

* Add headers (`h1-h6`) tag support for the new timeline renderer

* Make H1 and H2 use the same (smaller) style

* Update screenshots

---------

Co-authored-by: ElementBot <android@element.io>
---
 .../libraries/htmlrenderer/api/MessageNode.kt | 12 +++
 .../htmlrenderer/api/ui/HtmlMessageContent.kt | 88 ++++++++++++++++---
 .../api/ui/HtmlMessageContentPreview.kt       | 12 +++
 .../impl/DefaultHtmlMessageParser.kt          | 30 ++++++-
 .../impl/DefaultHtmlMessageParserTest.kt      | 19 ++++
 .../matrix/ui/messages/ToHtmlDocument.kt      |  6 ++
 ...rer.api.ui_HtmlMessageContent_Day_0_en.png |  4 +-
 ...er.api.ui_HtmlMessageContent_Day_10_en.png |  4 +-
 ...er.api.ui_HtmlMessageContent_Day_11_en.png |  4 +-
 ...er.api.ui_HtmlMessageContent_Day_12_en.png |  3 +
 ...rer.api.ui_HtmlMessageContent_Day_1_en.png |  4 +-
 ...rer.api.ui_HtmlMessageContent_Day_2_en.png |  4 +-
 ...rer.api.ui_HtmlMessageContent_Day_3_en.png |  4 +-
 ...rer.api.ui_HtmlMessageContent_Day_4_en.png |  4 +-
 ...rer.api.ui_HtmlMessageContent_Day_5_en.png |  4 +-
 ...rer.api.ui_HtmlMessageContent_Day_6_en.png |  4 +-
 ...rer.api.ui_HtmlMessageContent_Day_7_en.png |  4 +-
 ...rer.api.ui_HtmlMessageContent_Day_8_en.png |  4 +-
 ...rer.api.ui_HtmlMessageContent_Day_9_en.png |  4 +-
 ...r.api.ui_HtmlMessageContent_Night_0_en.png |  4 +-
 ....api.ui_HtmlMessageContent_Night_10_en.png |  4 +-
 ....api.ui_HtmlMessageContent_Night_11_en.png |  4 +-
 ....api.ui_HtmlMessageContent_Night_12_en.png |  3 +
 ...r.api.ui_HtmlMessageContent_Night_1_en.png |  4 +-
 ...r.api.ui_HtmlMessageContent_Night_2_en.png |  4 +-
 ...r.api.ui_HtmlMessageContent_Night_3_en.png |  4 +-
 ...r.api.ui_HtmlMessageContent_Night_4_en.png |  4 +-
 ...r.api.ui_HtmlMessageContent_Night_5_en.png |  4 +-
 ...r.api.ui_HtmlMessageContent_Night_6_en.png |  4 +-
 ...r.api.ui_HtmlMessageContent_Night_7_en.png |  4 +-
 ...r.api.ui_HtmlMessageContent_Night_8_en.png |  4 +-
 ...r.api.ui_HtmlMessageContent_Night_9_en.png |  4 +-
 32 files changed, 203 insertions(+), 66 deletions(-)
 create mode 100644 tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_12_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_12_en.png

diff --git a/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/MessageNode.kt b/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/MessageNode.kt
index 05be7fd8ea..0b28b0cd1a 100644
--- a/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/MessageNode.kt
+++ b/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/MessageNode.kt
@@ -54,6 +54,18 @@ data class ParagraphNode(
     val inlineContent: ImmutableMap<String, MentionNodeContent> = persistentMapOf(),
 ) : BlockNode
 
+/**
+ * A heading (`<h1>`–`<h6>`). Like a [ParagraphNode] it carries inline content ([text] and
+ * [inlineContent]), plus the heading [level] from 1 (largest) to 6 (smallest), used by the renderer
+ * to pick the typography.
+ */
+@Immutable
+data class HeaderNode(
+    val level: Int,
+    val text: AnnotatedString,
+    val inlineContent: ImmutableMap<String, MentionNodeContent> = persistentMapOf(),
+) : BlockNode
+
 /**
  * A preformatted code block (`<pre>`). Rendered in a monospaced, horizontally
  * scrollable container. The text is kept raw: no inline styling is applied inside it.
diff --git a/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/ui/HtmlMessageContent.kt b/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/ui/HtmlMessageContent.kt
index ecb13310be..a8daab7a90 100644
--- a/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/ui/HtmlMessageContent.kt
+++ b/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/ui/HtmlMessageContent.kt
@@ -62,6 +62,7 @@ import androidx.compose.ui.text.Placeholder
 import androidx.compose.ui.text.PlaceholderVerticalAlign
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.rememberTextMeasurer
@@ -76,6 +77,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.htmlrenderer.api.BlockNode
 import io.element.android.libraries.htmlrenderer.api.CodeBlockNode
 import io.element.android.libraries.htmlrenderer.api.DocumentNode
+import io.element.android.libraries.htmlrenderer.api.HeaderNode
 import io.element.android.libraries.htmlrenderer.api.HtmlMessageParser.Companion.INLINE_CODE_ANNOTATION_TAG
 import io.element.android.libraries.htmlrenderer.api.HtmlMessageParser.Companion.LINK_ANNOTATION_TAG
 import io.element.android.libraries.htmlrenderer.api.ListNode
@@ -158,6 +160,7 @@ internal fun BlockNode.lastBlockNode(): BlockNode? = when (this) {
     is ListNode -> this
     is QuoteNode -> this
     is CodeBlockNode -> this
+    is HeaderNode -> this
 }
 
 @Composable
@@ -180,7 +183,7 @@ private fun BlockNodeView(
     context: RenderContext,
     modifier: Modifier = Modifier,
 ) {
-    if (node === context.lastBlockNode && node !is ParagraphNode) {
+    if (node === context.lastBlockNode && node !is ParagraphNode && node !is HeaderNode) {
         SideEffect { context.onContentLayoutChange(ContentAvoidingLayoutData.NotOverlapping) }
     }
 
@@ -189,6 +192,7 @@ private fun BlockNodeView(
         is ParagraphNode -> {
             ParagraphView(node = node, context = context, modifier = modifier)
         }
+        is HeaderNode -> HeaderView(node = node, context = context, modifier = modifier)
         is CodeBlockNode -> CodeBlockView(node = node, modifier = modifier)
         is QuoteNode -> QuoteView(node = node, context = context, modifier = modifier)
         is ListNode -> ListView(node = node, context = context, modifier = modifier)
@@ -201,16 +205,6 @@ private fun ParagraphView(
     context: RenderContext,
     modifier: Modifier = Modifier,
 ) {
-    val linkColor = ElementTheme.colors.textLinkExternal
-    val codeBackgroundColor = ElementTheme.colors.bgSubtleSecondary
-    val codeBorderColor = ElementTheme.colors.borderInteractiveSecondary
-    val styledText = remember(node.text, linkColor) {
-        node.text
-            .linkify(SpanStyle(color = linkColor))
-            .applyLinkStyles(linkColor = linkColor)
-    }
-    val inlineContent = rememberMentionInlineContent(node.inlineContent, context)
-    val layoutResult = remember { mutableStateOf<TextLayoutResult?>(null) }
     // Only the last rendered paragraph (and only when not inside a code block / quote) reports its
     // measured last line to the timeline.
     val measureLastLine = if (node === context.lastBlockNode) {
@@ -218,21 +212,87 @@ private fun ParagraphView(
     } else {
         null
     }
+    TextBlock(
+        text = node.text,
+        inlineContent = node.inlineContent,
+        textStyle = ElementTheme.typography.fontBodyMdRegular,
+        context = context,
+        modifier = modifier,
+        onTextLayout = { measureLastLine?.invoke(it) },
+    )
+}
+
+@Composable
+private fun HeaderView(
+    node: HeaderNode,
+    context: RenderContext,
+    modifier: Modifier = Modifier,
+) {
+    // Only the last rendered paragraph (and only when not inside a code block / quote) reports its
+    // measured last line to the timeline.
+    val measureLastLine = if (node === context.lastBlockNode) {
+        ContentAvoidingLayout.measureLastTextLine(onContentLayoutChange = context.onContentLayoutChange)
+    } else {
+        null
+    }
+    TextBlock(
+        text = node.text,
+        inlineContent = node.inlineContent,
+        textStyle = headerTextStyle(node.level),
+        context = context,
+        modifier = modifier,
+        onTextLayout = { measureLastLine?.invoke(it) }
+    )
+}
+
+/**
+ * Renders an inline-content block (a paragraph or a header) as a [Text] with [textStyle], applying
+ * link styling, the inline-code background boxes, mention/image inline content and link taps.
+ */
+@Composable
+private fun TextBlock(
+    text: AnnotatedString,
+    inlineContent: ImmutableMap<String, MentionNodeContent>,
+    textStyle: TextStyle,
+    context: RenderContext,
+    modifier: Modifier = Modifier,
+    onTextLayout: (TextLayoutResult) -> Unit = {},
+) {
+    val linkColor = ElementTheme.colors.textLinkExternal
+    val codeBackgroundColor = ElementTheme.colors.bgSubtleSecondary
+    val codeBorderColor = ElementTheme.colors.borderInteractiveSecondary
+    val styledText = remember(text, linkColor) {
+        text.linkify(SpanStyle(color = linkColor))
+            .applyLinkStyles(linkColor = linkColor)
+    }
+    val resolvedInlineContent = rememberMentionInlineContent(inlineContent, context)
+    val layoutResult = remember { mutableStateOf<TextLayoutResult?>(null) }
     Text(
         text = styledText,
         modifier = modifier
             .drawInlineCodeBackgrounds(styledText, layoutResult, codeBackgroundColor, codeBorderColor, LocalDensity.current)
             .linkTapHandler(styledText, layoutResult, context),
-        style = ElementTheme.typography.fontBodyMdRegular,
+        style = textStyle,
         color = ElementTheme.colors.textPrimary,
-        inlineContent = inlineContent,
+        inlineContent = resolvedInlineContent,
         onTextLayout = { result ->
             layoutResult.value = result
-            measureLastLine?.invoke(result)
+            onTextLayout(result)
         },
     )
 }
 
+/** Maps an `<h1>`–`<h6>` [level] to a Compound typography style, largest first. */
+@Composable
+private fun headerTextStyle(level: Int): TextStyle = when (level) {
+    // For safety reasons, use the same style for H1 and H2, to avoid people using H1 for 'shouting' spam that fills the timeline with huge text
+    1, 2 -> ElementTheme.typography.fontHeadingLgBold
+    3 -> ElementTheme.typography.fontHeadingMdBold
+    4 -> ElementTheme.typography.fontHeadingSmMedium
+    5 -> ElementTheme.typography.fontBodyLgMedium
+    else -> ElementTheme.typography.fontBodyMdMedium
+}
+
 @Composable
 private fun CodeBlockView(
     node: CodeBlockNode,
diff --git a/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/ui/HtmlMessageContentPreview.kt b/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/ui/HtmlMessageContentPreview.kt
index 47da9af3bb..4187acd070 100644
--- a/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/ui/HtmlMessageContentPreview.kt
+++ b/libraries/htmlrenderer/api/src/main/kotlin/io/element/android/libraries/htmlrenderer/api/ui/HtmlMessageContentPreview.kt
@@ -26,6 +26,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.htmlrenderer.api.BlockNode
 import io.element.android.libraries.htmlrenderer.api.CodeBlockNode
 import io.element.android.libraries.htmlrenderer.api.DocumentNode
+import io.element.android.libraries.htmlrenderer.api.HeaderNode
 import io.element.android.libraries.htmlrenderer.api.HtmlMessageParser.Companion.INLINE_CODE_ANNOTATION_TAG
 import io.element.android.libraries.htmlrenderer.api.HtmlMessageParser.Companion.LINK_ANNOTATION_TAG
 import io.element.android.libraries.htmlrenderer.api.ListItemNode
@@ -55,6 +56,7 @@ internal fun HtmlMessageContentPreview(
 internal class HtmlMessageContentPreviewParam : PreviewParameterProvider<DocumentNode> {
     override val values: Sequence<DocumentNode>
         get() = sequenceOf(
+            headers(),
             richParagraph(),
             inlineCode(),
             multilineInlineCode(),
@@ -237,6 +239,16 @@ internal class HtmlMessageContentPreviewParam : PreviewParameterProvider<Documen
         ),
     )
 
+    private fun headers() = document(
+        HeaderNode(level = 1, text = AnnotatedString("Heading 1")),
+        HeaderNode(level = 2, text = AnnotatedString("Heading 2")),
+        HeaderNode(level = 3, text = AnnotatedString("Heading 3")),
+        HeaderNode(level = 4, text = AnnotatedString("Heading 4")),
+        HeaderNode(level = 5, text = AnnotatedString("Heading 5")),
+        HeaderNode(level = 6, text = AnnotatedString("Heading 6")),
+        paragraph(AnnotatedString("Body text under the headings.")),
+    )
+
     private fun document(vararg blocks: BlockNode) = DocumentNode(blocks.toList().toImmutableList())
 
     private fun paragraph(
diff --git a/libraries/htmlrenderer/impl/src/main/kotlin/io/element/android/libraries/htmlrenderer/impl/DefaultHtmlMessageParser.kt b/libraries/htmlrenderer/impl/src/main/kotlin/io/element/android/libraries/htmlrenderer/impl/DefaultHtmlMessageParser.kt
index 390a3647c0..5d46920763 100644
--- a/libraries/htmlrenderer/impl/src/main/kotlin/io/element/android/libraries/htmlrenderer/impl/DefaultHtmlMessageParser.kt
+++ b/libraries/htmlrenderer/impl/src/main/kotlin/io/element/android/libraries/htmlrenderer/impl/DefaultHtmlMessageParser.kt
@@ -18,6 +18,7 @@ import dev.zacsweers.metro.ContributesBinding
 import io.element.android.libraries.htmlrenderer.api.BlockNode
 import io.element.android.libraries.htmlrenderer.api.CodeBlockNode
 import io.element.android.libraries.htmlrenderer.api.DocumentNode
+import io.element.android.libraries.htmlrenderer.api.HeaderNode
 import io.element.android.libraries.htmlrenderer.api.HtmlMessageParser
 import io.element.android.libraries.htmlrenderer.api.HtmlMessageParser.Companion.INLINE_CODE_ANNOTATION_TAG
 import io.element.android.libraries.htmlrenderer.api.HtmlMessageParser.Companion.LINK_ANNOTATION_TAG
@@ -30,6 +31,7 @@ import io.element.android.libraries.htmlrenderer.api.spans.InlineCodeSpanStyle
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
 import org.jsoup.nodes.Document
@@ -81,12 +83,13 @@ class DefaultHtmlMessageParser(
         return blocks.toImmutableList()
     }
 
-    private fun parseBlock(element: Element): BlockNode? = when (element.tagName()) {
+    private fun parseBlock(element: Element): BlockNode? = when (val tag = element.tagName()) {
         TAG_P -> buildParagraph(element.childNodes())
         TAG_PRE -> CodeBlockNode(code = element.wholeText().trimEnd('\n'))
         TAG_BLOCKQUOTE -> QuoteNode(children = parseBlocks(element))
         TAG_UL -> buildList(element, ordered = false)
         TAG_OL -> buildList(element, ordered = true)
+        in HEADER_TAGS -> buildHeader(element, level = tag.removePrefix("h").toInt())
         else -> null
     }
 
@@ -102,6 +105,17 @@ class DefaultHtmlMessageParser(
 
     /** Builds a [ParagraphNode] from a run of inline [nodes], or `null` if it holds no content. */
     private fun buildParagraph(nodes: List<Node>): ParagraphNode? {
+        return buildInlineContent(nodes)?.let { ParagraphNode(text = it.text, inlineContent = it.inlineContent) }
+    }
+
+    /** Builds a [HeaderNode] of the given [level] from the inline content of [element], or `null` if empty. */
+    private fun buildHeader(element: Element, level: Int): HeaderNode? {
+        return buildInlineContent(element.childNodes())?.let {
+            HeaderNode(level = level, text = it.text, inlineContent = it.inlineContent)
+        }
+    }
+
+    private fun buildInlineContent(nodes: List<Node>): InlineContentBuilder.Result? {
         val builder = InlineContentBuilder()
         nodes.forEach { builder.append(it) }
         return builder.build()
@@ -199,21 +213,29 @@ class DefaultHtmlMessageParser(
             }
         }
 
-        fun build(): ParagraphNode? {
+        fun build(): Result? {
             val text = builder.toAnnotatedString()
             if (text.isBlank() && mentions.isEmpty()) return null
-            return ParagraphNode(
+            return Result(
                 text = text,
                 inlineContent = mentions.toImmutableMap(),
             )
         }
+
+        /** The flattened inline content of a block: styled text plus its inline-content placeholders. */
+        inner class Result(
+            val text: AnnotatedString,
+            val inlineContent: ImmutableMap<String, MentionNodeContent>,
+        )
     }
 }
 
 /** Tags that start a new block-level node. Anything else is treated as inline content. */
 private fun Element.isBlockLevel(): Boolean = tagName() in BLOCK_TAGS
 
-private val BLOCK_TAGS = setOf(TAG_P, TAG_PRE, TAG_BLOCKQUOTE, TAG_UL, TAG_OL)
+private val HEADER_TAGS = setOf("h1", "h2", "h3", "h4", "h5", "h6")
+
+private val BLOCK_TAGS = setOf(TAG_P, TAG_PRE, TAG_BLOCKQUOTE, TAG_UL, TAG_OL) + HEADER_TAGS
 
 private const val TAG_P = "p"
 private const val TAG_PRE = "pre"
diff --git a/libraries/htmlrenderer/impl/src/test/kotlin/io/element/android/libraries/htmlrenderer/impl/DefaultHtmlMessageParserTest.kt b/libraries/htmlrenderer/impl/src/test/kotlin/io/element/android/libraries/htmlrenderer/impl/DefaultHtmlMessageParserTest.kt
index dd90d64279..4c746524c1 100644
--- a/libraries/htmlrenderer/impl/src/test/kotlin/io/element/android/libraries/htmlrenderer/impl/DefaultHtmlMessageParserTest.kt
+++ b/libraries/htmlrenderer/impl/src/test/kotlin/io/element/android/libraries/htmlrenderer/impl/DefaultHtmlMessageParserTest.kt
@@ -12,6 +12,7 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.htmlrenderer.api.CodeBlockNode
+import io.element.android.libraries.htmlrenderer.api.HeaderNode
 import io.element.android.libraries.htmlrenderer.api.HtmlMessageParser
 import io.element.android.libraries.htmlrenderer.api.ListNode
 import io.element.android.libraries.htmlrenderer.api.MentionNodeContent
@@ -191,6 +192,24 @@ class DefaultHtmlMessageParserTest : RobolectricTest() {
         assertThat(paragraph.text.text).isEqualTo("Actual message")
     }
 
+    @Test
+    fun `headers become HeaderNodes with their level and inline content`() {
+        val document = parse("<h1>Title</h1><h3>Subtitle with <strong>bold</strong></h3><h6>Small</h6>")
+        assertThat(document.children).hasSize(3)
+
+        val h1 = document.children[0] as HeaderNode
+        assertThat(h1.level).isEqualTo(1)
+        assertThat(h1.text.text).isEqualTo("Title")
+
+        val h3 = document.children[1] as HeaderNode
+        assertThat(h3.level).isEqualTo(3)
+        assertThat(h3.text.text).isEqualTo("Subtitle with bold")
+
+        val h6 = document.children[2] as HeaderNode
+        assertThat(h6.level).isEqualTo(6)
+        assertThat(h6.text.text).isEqualTo("Small")
+    }
+
     @Test
     fun `blank input produces an empty document`() {
         val document = parse("   ")
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/ToHtmlDocument.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/ToHtmlDocument.kt
index 2f52320b0d..5cb3535b06 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/ToHtmlDocument.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/ToHtmlDocument.kt
@@ -89,6 +89,12 @@ private object CustomHtmlToDomParser {
             "blockquote",
             "p",
             "br",
+            "h1",
+            "h2",
+            "h3",
+            "h4",
+            "h5",
+            "h6",
             // Add custom `mx-reply` tag, even if it's just to remove its contents from the plain text version of the message
             "mx-reply"
         )
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_0_en.png
index b587d7bdbd..cee03b9170 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24d689575196e5320e44cdf6882bcf7b4c696fa58d263af7b6864787dd606533
-size 7946
+oid sha256:6ae9a8d351b170dee11bbf0d674625570d66fc6da86f948330d23054c26c8c49
+size 23969
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_10_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_10_en.png
index 54a03450e2..61c461a1e9 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a38304be44c5fcf2a9115acef98d71d8b9fe03dcbefb0cfa76546e39911ab8a
-size 21732
+oid sha256:780f661eca8275cc2fb70f7b504f8f95f79f387d6e72b2702cbb5da150c081a0
+size 8059
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_11_en.png
index 36fea9517e..54a03450e2 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9cf8a07aeadd7d54bcdf3304d0bf1efe0a00c1964c02b0a24cd6d7718cc51d4b
-size 31085
+oid sha256:7a38304be44c5fcf2a9115acef98d71d8b9fe03dcbefb0cfa76546e39911ab8a
+size 21732
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_12_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_12_en.png
new file mode 100644
index 0000000000..36fea9517e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_12_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9cf8a07aeadd7d54bcdf3304d0bf1efe0a00c1964c02b0a24cd6d7718cc51d4b
+size 31085
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_1_en.png
index 104effeaec..b587d7bdbd 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18579f8262a4a55997ef8ab3e085ce7d32e97b454b999ea685656a9b67163f93
-size 9363
+oid sha256:24d689575196e5320e44cdf6882bcf7b4c696fa58d263af7b6864787dd606533
+size 7946
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_2_en.png
index 989ac136d6..104effeaec 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f6aa713c17f33c96e75b623daba8b45c29c147b46724b2fba4fa1fc662e1f95
-size 19547
+oid sha256:18579f8262a4a55997ef8ab3e085ce7d32e97b454b999ea685656a9b67163f93
+size 9363
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_3_en.png
index 5bdba00a36..989ac136d6 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2d495aa0a148d9e72d6bdf5f8a68d6934c44084e9669bac5e2ddde2d45d34c0
-size 8086
+oid sha256:7f6aa713c17f33c96e75b623daba8b45c29c147b46724b2fba4fa1fc662e1f95
+size 19547
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_4_en.png
index b97d04658b..5bdba00a36 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b316c5766db0f51151b45bb523e7879bad4a3999f51402e359b1a102829b276a
-size 10875
+oid sha256:f2d495aa0a148d9e72d6bdf5f8a68d6934c44084e9669bac5e2ddde2d45d34c0
+size 8086
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_5_en.png
index fe0cd344e5..b97d04658b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df17f77b172f58c725a6c30c092ae3fdb2e561785ffe124bdc4fa08fc686f794
-size 21035
+oid sha256:b316c5766db0f51151b45bb523e7879bad4a3999f51402e359b1a102829b276a
+size 10875
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_6_en.png
index 04814e712c..fe0cd344e5 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6d17d65431bc2c7728a3ad5c6d2fdedbf45658f51ed8f6d73bc26de799b79af
-size 10021
+oid sha256:df17f77b172f58c725a6c30c092ae3fdb2e561785ffe124bdc4fa08fc686f794
+size 21035
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_7_en.png
index 8937dd7d87..04814e712c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55da0734cf5c1c97e17eee5c88273fc63c94dfa7b3eab12a3e1ea2da0783e039
-size 8812
+oid sha256:c6d17d65431bc2c7728a3ad5c6d2fdedbf45658f51ed8f6d73bc26de799b79af
+size 10021
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_8_en.png
index b1f89a1f45..8937dd7d87 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e457089542659d700e4493bf1d345f79d7c829cbbded2d4337882a7e45f6808
-size 8783
+oid sha256:55da0734cf5c1c97e17eee5c88273fc63c94dfa7b3eab12a3e1ea2da0783e039
+size 8812
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_9_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_9_en.png
index 61c461a1e9..b1f89a1f45 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:780f661eca8275cc2fb70f7b504f8f95f79f387d6e72b2702cbb5da150c081a0
-size 8059
+oid sha256:2e457089542659d700e4493bf1d345f79d7c829cbbded2d4337882a7e45f6808
+size 8783
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_0_en.png
index b5d45f25e3..f33daef910 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:239ea1c7968861e97a6303fa64a8bd14f9140f50e73440329286ca1f0485795b
-size 7724
+oid sha256:561516463cfb7c33307781265d09c3055640773d366247bbed04642b71ca36b9
+size 23200
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_10_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_10_en.png
index 079a0c20cc..7fbf2c7e88 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a74061cb811c957c9b00520eb37566b58168b31ebe74a06506e8ed6c76e03b5f
-size 20803
+oid sha256:fc284fea350c1bfdbd73df2a0065484f77361c707f4ee8d60a29dafde07e8af0
+size 7774
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_11_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_11_en.png
index 7cc90da21f..079a0c20cc 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb4918eba234005d307ff24540bc837d4e3f06db06eee6e841e5c2af6cae1063
-size 30378
+oid sha256:a74061cb811c957c9b00520eb37566b58168b31ebe74a06506e8ed6c76e03b5f
+size 20803
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_12_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_12_en.png
new file mode 100644
index 0000000000..7cc90da21f
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_12_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb4918eba234005d307ff24540bc837d4e3f06db06eee6e841e5c2af6cae1063
+size 30378
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_1_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_1_en.png
index 7f8a883927..b5d45f25e3 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c07fe4ad8f0b14daec7ded50f1886a83868be166a7f42a5dacea985538d97b3
-size 8924
+oid sha256:239ea1c7968861e97a6303fa64a8bd14f9140f50e73440329286ca1f0485795b
+size 7724
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_2_en.png
index 18345ce06c..7f8a883927 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccbda5890ab6e53c66483ed169175d223525ac6c4bd7dc6f845c10a9f2531e65
-size 18802
+oid sha256:1c07fe4ad8f0b14daec7ded50f1886a83868be166a7f42a5dacea985538d97b3
+size 8924
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_3_en.png
index fcbac285f0..18345ce06c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:049a666793d96ad5d4217390adec761e7c3972fded6ca1159a70dbf97f97b725
-size 7901
+oid sha256:ccbda5890ab6e53c66483ed169175d223525ac6c4bd7dc6f845c10a9f2531e65
+size 18802
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_4_en.png
index d564c06517..fcbac285f0 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:efe82e2ec14616e1614e404c0d470c0447816745d954287abd5ade9020d18e6a
-size 10469
+oid sha256:049a666793d96ad5d4217390adec761e7c3972fded6ca1159a70dbf97f97b725
+size 7901
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_5_en.png
index a3c904e385..d564c06517 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:323355db6c969094011a384c9e1f939d056415309400a270a56a6842a7d5072f
-size 20153
+oid sha256:efe82e2ec14616e1614e404c0d470c0447816745d954287abd5ade9020d18e6a
+size 10469
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_6_en.png
index 64a6c9553e..a3c904e385 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:79f9cfc67be1aa32d6eb05bcfe8bab6b4bff43ab8757668c3ea0ebccf5383089
-size 9806
+oid sha256:323355db6c969094011a384c9e1f939d056415309400a270a56a6842a7d5072f
+size 20153
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_7_en.png
index 5d48d880e6..64a6c9553e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2bc513febce6bcc1a452cedbfe640ff029cdd8bafcae852d6bdaa2fac4b85094
-size 8593
+oid sha256:79f9cfc67be1aa32d6eb05bcfe8bab6b4bff43ab8757668c3ea0ebccf5383089
+size 9806
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_8_en.png
index 30fad755ca..5d48d880e6 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3db9c79b4e0ce71b93da5aba58fd9bdcc977a0a979eb89f8027b3ca378f25d5e
-size 8360
+oid sha256:2bc513febce6bcc1a452cedbfe640ff029cdd8bafcae852d6bdaa2fac4b85094
+size 8593
diff --git a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_9_en.png b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_9_en.png
index 7fbf2c7e88..30fad755ca 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.htmlrenderer.api.ui_HtmlMessageContent_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc284fea350c1bfdbd73df2a0065484f77361c707f4ee8d60a29dafde07e8af0
-size 7774
+oid sha256:3db9c79b4e0ce71b93da5aba58fd9bdcc977a0a979eb89f8027b3ca378f25d5e
+size 8360

From cc70885552d92a7d637202cc8f870e1eb64baa2e Mon Sep 17 00:00:00 2001
From: ElementBot <android@element.io>
Date: Wed, 23 Sep 2026 12:43:52 +0000
Subject: [PATCH 18/20] Update screenshots

---
 ...nts.preview.imageeditor_AttachmentImageEditorView_2_en.png | 4 ++--
 ...nts.preview.imageeditor_AttachmentImageEditorView_5_en.png | 4 ++--
 ...rypto.identity_MessagesViewWithIdentityChange_Day_0_en.png | 4 ++--
 ...rypto.identity_MessagesViewWithIdentityChange_Day_1_en.png | 4 ++--
 ...rypto.identity_MessagesViewWithIdentityChange_Day_2_en.png | 4 ++--
 ...pto.identity_MessagesViewWithIdentityChange_Night_0_en.png | 4 ++--
 ...pto.identity_MessagesViewWithIdentityChange_Night_1_en.png | 4 ++--
 ...pto.identity_MessagesViewWithIdentityChange_Night_2_en.png | 4 ++--
 ...re.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png | 4 ++--
 ...re.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png | 4 ++--
 ....resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png | 4 ++--
 ....resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png | 4 ++--
 ...meline.components.event_ATimelineItemEventRow_Day_0_en.png | 4 ++--
 ...line.components.event_ATimelineItemEventRow_Night_0_en.png | 4 ++--
 ....components_TimelineItemEventRowDisambiguated_Day_0_en.png | 4 ++--
 ...omponents_TimelineItemEventRowDisambiguated_Night_0_en.png | 4 ++--
 ...ents_TimelineItemEventRowWithReplyInformative_Day_0_en.png | 4 ++--
 ...ents_TimelineItemEventRowWithReplyInformative_Day_1_en.png | 4 ++--
 ...ts_TimelineItemEventRowWithReplyInformative_Night_0_en.png | 4 ++--
 ...ts_TimelineItemEventRowWithReplyInformative_Night_1_en.png | 4 ++--
 ...components_TimelineItemEventRowWithReplyOther_Day_0_en.png | 4 ++--
 ...components_TimelineItemEventRowWithReplyOther_Day_1_en.png | 4 ++--
 ...mponents_TimelineItemEventRowWithReplyOther_Night_0_en.png | 4 ++--
 ...mponents_TimelineItemEventRowWithReplyOther_Night_1_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_0_en.png | 4 ++--
 ...ine.components_TimelineItemEventRowWithReply_Day_10_en.png | 4 ++--
 ...ine.components_TimelineItemEventRowWithReply_Day_11_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_1_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_2_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_3_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_4_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_5_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_6_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_7_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_8_en.png | 4 ++--
 ...line.components_TimelineItemEventRowWithReply_Day_9_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_0_en.png | 4 ++--
 ...e.components_TimelineItemEventRowWithReply_Night_10_en.png | 4 ++--
 ...e.components_TimelineItemEventRowWithReply_Night_11_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_1_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_2_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_3_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_4_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_5_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_6_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_7_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_8_en.png | 4 ++--
 ...ne.components_TimelineItemEventRowWithReply_Night_9_en.png | 4 ++--
 .../images/features.messages.impl_MessagesView_Day_12_en.png  | 4 ++--
 .../images/features.messages.impl_MessagesView_Night_0_en.png | 4 ++--
 .../features.messages.impl_MessagesView_Night_10_en.png       | 4 ++--
 .../features.messages.impl_MessagesView_Night_12_en.png       | 4 ++--
 .../images/features.messages.impl_MessagesView_Night_2_en.png | 4 ++--
 .../images/features.messages.impl_MessagesView_Night_4_en.png | 4 ++--
 .../images/features.messages.impl_MessagesView_Night_6_en.png | 4 ++--
 .../images/features.messages.impl_MessagesView_Night_8_en.png | 4 ++--
 ...references.impl.blockedusers_BlockedUsersView_Day_4_en.png | 4 ++--
 ...references.impl.blockedusers_BlockedUsersView_Day_5_en.png | 4 ++--
 ...ferences.impl.blockedusers_BlockedUsersView_Night_4_en.png | 4 ++--
 ...ferences.impl.blockedusers_BlockedUsersView_Night_5_en.png | 4 ++--
 ...es.preferences.impl.userstatus_UserStatusView_Day_5_en.png | 4 ++--
 ...es.preferences.impl.userstatus_UserStatusView_Day_6_en.png | 4 ++--
 ....preferences.impl.userstatus_UserStatusView_Night_5_en.png | 4 ++--
 ....preferences.impl.userstatus_UserStatusView_Night_6_en.png | 4 ++--
 ...embermoderation.impl_RoomMemberModerationView_Day_5_en.png | 4 ++--
 ...embermoderation.impl_RoomMemberModerationView_Day_7_en.png | 4 ++--
 ...bermoderation.impl_RoomMemberModerationView_Night_5_en.png | 4 ++--
 ...bermoderation.impl_RoomMemberModerationView_Night_7_en.png | 4 ++--
 ...eme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png | 4 ++--
 ...e.components_HorizontalFloatingToolbarNoFab_Night_0_en.png | 4 ++--
 ...em.theme.components_HorizontalFloatingToolbar_Day_0_en.png | 4 ++--
 ....theme.components_HorizontalFloatingToolbar_Night_0_en.png | 4 ++--
 72 files changed, 144 insertions(+), 144 deletions(-)

diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_en.png
index 8edee63bc1..3192cf2a5e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de82970da241172b94f822f8792e6fc721dcfc7f0f67e3523962e253e9750884
-size 255933
+oid sha256:1885bbe8b0ea497ac20d7bcdd0c6a93ba0533e898378d35e1cafdc8c9924fd56
+size 279984
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_en.png
index ccfdd7d9ed..f899ad5d43 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.attachments.preview.imageeditor_AttachmentImageEditorView_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe6cb72de5079be2ac02ec39f74bac0d20492cd6f5509b71ad9cfc4cc52955d3
-size 326468
+oid sha256:1ca032575e4ebd75a2ebc5a4cb9f966e48cdfa56f4ff42d6d9309fa3577a1adb
+size 310609
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en.png
index 5f51b27f5e..693a36b7dd 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3274314ab9e39c23a6b9d66adf80ac8bb7b364ce60a300f96582374a18bc821f
-size 54590
+oid sha256:3dbb8ef39b6a7a0c2f576d8bd101aa97c89da696f23e6d5836846494471c01a1
+size 55799
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png
index e1f6ee6430..b1850a50a5 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e27c7c51fe07cca51b92a601aa9c58deab609bfa5e82f8f6f88eaab6ae59ec3
-size 64307
+oid sha256:f1dd0da147212e13a6c0ad5ad8f85ce55666c444076c238ea27eba5605cfab1f
+size 56909
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en.png
index 5289eaca63..4185f46b51 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65f9ee083a73669a0d3f9d88141a610ea53f3c39e89d8f706d414b04555b4764
-size 59321
+oid sha256:085963fcb425147d35a9ad947a7a3e4ba4712bd3d2f32e93099ff15cffe83b88
+size 64761
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en.png
index d3f7da6320..2e70435fa5 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a94a4cc176b5d52ef9b21339749324adeef9857b6cdaa2ae973903e2408662a
-size 55904
+oid sha256:7a3667390d9d88894bbdd5d72b0b714b29c9ff160653e310e97b0da87b6ba8b0
+size 54724
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png
index bd3b0196d6..0f6de1b844 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f7f7415abbe51858f938e16ad03c6aab983fb3d5e2a53a028bae3c031446646
-size 67848
+oid sha256:28512b0fda0b71b98eab03cee15c9d3163825b1a3545670cfa277ddd5434c87a
+size 58417
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en.png
index f4d51ccc61..6c774d4cec 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a8f5aaaa7ebb0e61b07867590d99a8791c5d04cad1ce0f334d23dce6f26c6e6
-size 67276
+oid sha256:6ed6a5f1a2055e19a6b8fb0af4738845bd2184f755c323022c52154cdfa07e05
+size 60909
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png
index bd73e322ab..02d0fc8eeb 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12020ba97720f2374f9ace172693f08be01522e4ca30d3970efa91d802581e81
-size 3657
+oid sha256:f77d8243c23d3f37dff86dec53671cbde9fafe1314f6e6b445abdfe47d751ad6
+size 56187
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png
index 93622cedfe..bd73e322ab 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87193a7c9eb9d40234970e5f5be02e80f2b3ffe91e2c9ca6afd58b8bccdd5911
-size 55075
+oid sha256:12020ba97720f2374f9ace172693f08be01522e4ca30d3970efa91d802581e81
+size 3657
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png
index bd73e322ab..0cf6c10c4e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12020ba97720f2374f9ace172693f08be01522e4ca30d3970efa91d802581e81
-size 3657
+oid sha256:49f0bb16d3d57b59242e704e3dd4e8885c59721a42129837ff6a4f0d7d02de11
+size 54433
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png
index bd73e322ab..adec213a8c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12020ba97720f2374f9ace172693f08be01522e4ca30d3970efa91d802581e81
-size 3657
+oid sha256:8ebee4aec3dbab6e1bb05fda7c5e423f0e931560743d0f0ccbac6b70fa9ad808
+size 52921
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_en.png
index 0ab00359b7..12bd190dd1 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b5e6f4c5ec97e67bb20f03f25f18d9f32d5d1aed5ff30d161b331894ad03443
-size 647384
+oid sha256:ce15ca9f89274620728715e3448ce671e2253f4fed22a44035460e9a3709ca0b
+size 647404
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Night_0_en.png
index 0ccdcbb603..160d58f9ec 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.event_ATimelineItemEventRow_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0424685437a433b35b589668b409d55f26ab41bcae01af0121a54033c56a8c2
-size 646194
+oid sha256:c4e7b28b78cfbcbb6abf00317eea945859ac6465cecf81a3ad15801b0de721e4
+size 646216
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en.png
index ab6392a424..0435f55de6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94f89a37549a3f198442db467bc7d8539f0b5649d97927bfe731f090d6dfb03d
-size 379505
+oid sha256:ff839731834d7d0c94fa9a2c412014ddbaeaa053c5af1c8cbd00a3f3a583f364
+size 379511
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en.png
index f0b5506b89..9cbd5c1d95 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04ea6c2947a21d3d4a3d43e9c4750c4f2a49056536a4da3f34c95df8353e9de3
-size 377990
+oid sha256:d0e170b4bea262de612bf3374d475fcd25470ff91b7554d20809c51857a78cec
+size 377963
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en.png
index 3ac59caeea..1f0fdabe6d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a94d5198e27338675c0e15df5874ba3272ee315b8d77291dc7ccc7c754ed1f4
-size 365082
+oid sha256:b8bb5a6de6601da8d7fe59f110a054577e2e25dae4bb449f60c04e7d7a1b9551
+size 365073
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en.png
index 195aa04fe2..86018764ac 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76e5ae44362792d570cd82f3910c8bd0acde509b8418c5892e0385e7d636f042
-size 370223
+oid sha256:8344427a0fe87cbf0883ff53a9ee4dcf90976a7011f6618d85961df48b2c53a9
+size 370228
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en.png
index 29771235f0..058a3992c3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60b9f2b920cd2a2a414805d1f0f77925232d9ae60bd607fa18d4395cda2dd73d
-size 363291
+oid sha256:00fe1e676086766a3eac3e4457eff52c989789fc5d8d0df2624c019ed25ce9af
+size 363322
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en.png
index db4ea8296a..c6d4541184 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f0d24b8011564ee7a8b2f8c2e6a24eda668ee42d451d862f884acb7926aa06c
-size 368529
+oid sha256:c00e504593d8eb61b598f05f46ee4d591757975a80c0b4227b240847d2cd4868
+size 368510
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en.png
index 94428abb56..84d9d4e5c3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36d7cf2510d546d2b330b1d1b1674ce58df0558c547e443794a1e7b2222add87
-size 347897
+oid sha256:7c609a633ab23eae5729ecb57a17a385bac65e81cbf0180c01e0847f1028039e
+size 347890
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en.png
index 5400a98a50..40fa5d563f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:40a23ddff1fe46a486a5d34d94e0e67ec14d0b2b9c6bee2ddbadc17ce0948b7b
-size 367131
+oid sha256:3ff97eb99daf65f74b469d51b93bd77d304d0c780b9406e1c4d7893b71e3c68d
+size 367163
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en.png
index 22ff4965d1..bac23aab98 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:787151f8f242a8794a804bf14831f6ca680814d617e85feb3652103e8a0f20cd
-size 346565
+oid sha256:e30686c7c037ef102717e0316543faf4d3ed2671c21eca96a667150daab380d6
+size 346614
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en.png
index c3b6a086fe..2348755afd 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e615c14cd23f3efd217ec20ce05ed32be76dc3317091e8221f1a72a5a594d92
-size 364175
+oid sha256:e907f67ef884edb61df187f0f229ed4ff4cb31f8c276f807698f861c0e7a4c27
+size 364124
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en.png
index 67490ba700..01d4dca84b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4431e2d9f30123949ea5676ce60f642234adcf9b5a33f2acc3f80ebf6609a66
-size 369730
+oid sha256:ef2bf449671b652cb152b3baab92ab100eab77a54229ab49daeab156f2f484d0
+size 369724
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en.png
index 1600afff71..f0dfbc3321 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:273351cc9c533b2424859a0de00a8a3786628abc3a88175705c4205dedf7e9aa
-size 354737
+oid sha256:f7a6302320bd1e4258e03487539bf46b0b12781dfc8a22b3f9f267017a6146fa
+size 354751
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en.png
index c4943b892c..e38cf03ad6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c410e853089cc2c4a2c48a00dd9a8babc8095aed72bb4625057444710559c6c
-size 368129
+oid sha256:41a0e404dea7f52359b24b3ec3926b1405429b165cfed44c63b3922ea6d3cb46
+size 368114
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en.png
index b5dac8434c..68f8148879 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a92f8af94682facac66d4aacb6e49f345561c15be2f8b689041b78aeaaae831
-size 345062
+oid sha256:6ca8cf82aa8ab1bdad56a27584b27789402aeb7ad8fadd038280a376fb75a72c
+size 345094
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en.png
index 1b99468924..8aa2cca147 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a9509411777f342261cab58b92a022b3c9f8f0f7a9e4d0527120a91976575f0
-size 357733
+oid sha256:02ecb903124273e24151ea2088f6b99144f7dcadba00a582b6210dd23835b5c9
+size 357743
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en.png
index cececc229a..b5032c29b3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0c6dafaa41849af00d5097a85bd88e3a054a0a9e41c0466a08e6ff8dd6102b2
-size 356857
+oid sha256:dce23463c335d01eb67293cfcede5d85e96ab2ba035cc9a188d42e8e6866bc63
+size 356831
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en.png
index 14a40a5676..a332744358 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a11044fe90227f1f316a1ade8587e545bb620e11cca76865fc2eb83cdb817fc5
-size 364655
+oid sha256:588967869cbd25ed8b82aff5618175660a8a9e45a5a861b1c7867cf1913f575b
+size 364646
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en.png
index d7b969fd5b..133fd3903f 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2528df873713755f542f61cd794080929586c1bd5f316c0378ce9e837c21d50b
-size 397145
+oid sha256:426d1c844a8c88281c5fa4c61916d93278fdfd38f8cdf2dc54bf1a821f2de3eb
+size 397167
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en.png
index 63bd9c3f6d..0041a870b9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6cd94664f89bdad2a9761ea8b20acb83fed3ed7cb5be41af8fe4852643c0bfc
-size 356175
+oid sha256:a2bd77c08be705c66225f16c29fd6826decd92b41922d0f8ffc0d1a63d8c59d2
+size 356193
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en.png
index 9fcf389708..f67906a37c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9daeee1aaa04247da3c8bb5aaae9947aab1ed2d2057995e53d6ebdb63e5cd356
-size 355848
+oid sha256:ffa68c8398d789444151855496e5df4ffa03218a383db6ea46fd4f979829b823
+size 355831
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en.png
index d235670def..6e83d6491d 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a00bd766a00b7e7c6615fc53bf469b3ca5056a6c514c096431ae38d99d604306
-size 364845
+oid sha256:34152c742abc486a48234e22101833bc163cf11979890d06aac41e68e3c404d0
+size 364846
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en.png
index 0021619c44..b10f9741b9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b23d3a37774283067a8919b8c332b1bb5a79e90dceb7216b484b985491282e5
-size 355389
+oid sha256:3ec1b0244dab22414c6719b3309426e13128d0c70fb67dc66cd8a60d42521fd0
+size 355411
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en.png
index 422c324695..77abe20982 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1df8d22766981fc76d6d767dc3f40d98cadc7c51be20417b067b91af604232b
-size 367884
+oid sha256:5c3d87862c6d7fc88d0f23cd54c5b9f77028992fdd7c282a195b964dd17e85ac
+size 367855
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en.png
index 448bcec677..1d34761a9b 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe0daf9161bc2da194992a2fc9505bf2009c5dbed78cdb35d2eb7ed1380a7df5
-size 353037
+oid sha256:f7d9b5fc0ff5d7828ad6f4dc0c9bd9520b4920553da97ed7b4e030ee844c0208
+size 353054
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en.png
index c081fa16a5..5243218ae3 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a92bcf5885322e11a706071969fb674b1f6e60e021af153aaa125baa4a602ae
-size 366285
+oid sha256:9a85db2f5958db867578663533f204b2e803372d470da890fd8056ffed0cf46c
+size 366254
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en.png
index 47a9a6b630..b6d1f07279 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54372845e922d047408dd960d048b9b5eae2263d589117d8e7d197741aa34f32
-size 342827
+oid sha256:4bee12a6bdb18fea5ac6997671bfcb903296da7278cf69b2456330066ca31dfb
+size 342870
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en.png
index 5560c21967..ceca184bd7 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af4a48ee80535f2c0a226c4ffa4344054fb63b7b0a88ea2c030a4eb8dd5e9644
-size 356078
+oid sha256:8e82011a72f36889c53ab61ed2b9947c7fb5f868c9b7010904fc10f4ca587082
+size 356082
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en.png
index 5cc5cfe4fc..5cdad1df92 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6524cc87257cc9d3f135904f4e14594b56df695e71fe576418d2319c472d710b
-size 355285
+oid sha256:9e2d8caf5aaae7d3406c703288e491f328552f0acd18e56afd5265b4ceaf1cd1
+size 355272
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en.png
index e9d85990e8..a431a9429a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66d4b6ea4a697735bbb0fac936b89cde99c5077973ba828894bf50b5dae233b3
-size 362848
+oid sha256:93c2df04d65f6078ce3f7067fbae8a7317ec42ed0fc013dee962a3953269f3b7
+size 362813
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en.png
index b51a89586b..0eb106f4a9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e642229c58169775fe702769a306bbef22698516ae6f7ac75a761213c3f195fa
-size 395446
+oid sha256:217ac95bf476c53d2dc6d3d0143b21312bf38b8ab86c8dfd4f9360582b584f9d
+size 395476
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en.png
index aa322fc2e4..ae8495618a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5fae87094ea13b14e2dc7c16ca96e4f8096ff39e962799468fb4ead4c666620f
-size 354381
+oid sha256:08057fdc1e1184720b438ddd2a8753f00791baf2456cc30b45de8e6bdeb57e8e
+size 354404
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en.png
index 40105c1498..9d617f6688 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ed24d190f10c079f8cf176404372d40eb25cc78ce595a22febc540315057b86
-size 354075
+oid sha256:dabad9dcd5b8f0d4bb964a0187ad7c94b023b04552dacd29a077daddfd48d550
+size 354052
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en.png
index 0cfd1dc985..1a8ea3e4e9 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:545c9e8933e420cc3f8fbba0fbd5162c946c65a20721faeb77c568596ca720cd
-size 363045
+oid sha256:66aba7b4271a990fac85b0bbc7cbdc371fa1e38a4da5bb4e2f62a80b21cb3a8f
+size 363012
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en.png
index c9227ebf94..c8306263a0 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e614f4a8657637c584a283d69124236d00fe1251c2b8d739c5688a57a6fd152e
-size 353693
+oid sha256:756f0cff90ddd61adce2f467c0384d74d430f6d51c091e4980e45bcc9ee6f0fd
+size 353705
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_12_en.png
index b2e29b6c25..9414c8e37a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Day_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b68f247755ed20b6c597099c377d87ce57ad6131f57a641223c248ea04f8f1a6
-size 52141
+oid sha256:0fd796e47ddfd398a5558383456b9ed5f9261eb50a82eb3b34c58dd503962555
+size 51185
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_0_en.png
index cfa6e4dbc3..89fc6708d2 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a3281f35461edb900ea434c68543dc684a5fad7dab7c9aabac510bc59d442b3
-size 56479
+oid sha256:89467c5b84d0a15210d4013013598d9994d3005a2299e44583d78355e6718ad8
+size 55538
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_10_en.png
index 5f3a619097..17df34a50a 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19d14e3d779b163053c28e66d3381f0cabe3b540744606e955cd733f9e044089
-size 51713
+oid sha256:6548f5bf1906e1dddcbcc03bb8f76b42e604075751ea8efbc3ead826bf4cfad7
+size 51258
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_12_en.png
index b46bcd0a0e..438beb77ed 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e3e355c5d274b11f973d624ee3c3a275bf7d6c45f390fef3228b2e32de91e35
-size 48480
+oid sha256:e45f96b35d3e1dbc756a580778e6f3b9bfc256469b836f086b0892c1e096ff5a
+size 45165
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_2_en.png
index f4ab74029b..f425dd2c4c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:51a5b682243b969bc2d7d609decb823b0509d240f3ff14ee78319260af76a47f
-size 58740
+oid sha256:bd6dc088e16f722b36c2198d6a8611af87dec2451f94ca3c2b6880b97f709b98
+size 54095
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_4_en.png
index 0ad1e67deb..486d5da5c6 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82e6e38576a507b19e58fce9dda0734ec00bcedcb0baf8f4c7919dbaaf7d2b85
-size 55046
+oid sha256:e482603e6d03fffb57d4eb135edb6209c748c51b1f07e638a4ccf133b1b87a79
+size 52920
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png
index f82a7a8219..0383bb8f95 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22ea7fe121a63b35a2c2bb47609e692f8bf2b913871a6baf3d420c04334c6c4a
-size 44344
+oid sha256:7c88b3ed8cc69dee59d4d0a726a9e383d00f2815b6525315f7dcd96f9c25ec2a
+size 45618
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_8_en.png
index cfa62a6626..0f7fe2db38 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bfe848e4c365cf4b4d663145f74e5f8b3f47a4c8994961c530603f0248400316
-size 57117
+oid sha256:a576d52b840730334a38046cf8b57993693fc760b4fbdc00376cb48b7268d76e
+size 55890
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en.png
index 7cca911c45..074820e157 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26e14b77fa3c3aeaea58782309e6de8b9047e07945009322990ebf5f4c283309
-size 52770
+oid sha256:7caacb336793b8ae4b83e9a10a82325e25e8b3c036f881898ed28688250eb6e0
+size 55744
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en.png
index 2af459c158..7cca911c45 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28a95d4b7ebca92c4e0467f3ecd9acdaf7f6257604d190f5d088a9a25e87d637
-size 55305
+oid sha256:26e14b77fa3c3aeaea58782309e6de8b9047e07945009322990ebf5f4c283309
+size 52770
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en.png
index 616c06bf46..a68f886f73 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ce2519906f1aaf34700ca9ba4bdeaa72030f1f5aff3f7e24352a1435ac67d98
-size 53966
+oid sha256:e5a2e306087a967849f61872b56a83f194d1a76df5723f0bbae6e6e2f4a98c63
+size 55725
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en.png
index 616c06bf46..36d19c6b72 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ce2519906f1aaf34700ca9ba4bdeaa72030f1f5aff3f7e24352a1435ac67d98
-size 53966
+oid sha256:7dfa2767c55a81d3f121b8fa55443b7b05f9369e91639b80e0be349863799ad7
+size 55438
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_5_en.png
index 82f344f714..2c15fd6a37 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d96eefa01a5de803b0cc9d9109c20df86eaff01b73ff24a91945b43d53d5d01
-size 11960
+oid sha256:7260abe16fc2ab4f6ada97ea0f756dc5c9908ff3b61d6ec1723ffde302bb3dc5
+size 11955
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_6_en.png
index fdd8fcd5a5..7c422591ad 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22678a2a8505e1d9d5bfcb44459b6fac69c11a4bf72fae09c48ffa2e54f5a110
-size 12128
+oid sha256:2e16fc1daa0f284c442f66591e1d1f59161272a67998d26740b0b403bfe82495
+size 11866
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_5_en.png
index f6e27475da..acb8afa74a 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ee89826c8aa2ac0371ed31959243f62bf9968806a7b27117cd7b4d849423a33
-size 11667
+oid sha256:bed7565420e11c43acc06896ef298683d2f2dd1dc16c430eab7018e9ead9937a
+size 11652
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_6_en.png
index b1bb69efb8..e0a4cb1c97 100644
--- a/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.preferences.impl.userstatus_UserStatusView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e27cb9e501ccbac54926f0252b4098867643a2d2683c5b267f86ad99edf6f5d7
-size 11817
+oid sha256:87811df502c760816e74beb006341627857c39380ce715f1a747ac9fce77b226
+size 11516
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en.png
index 73b8b8e50c..5c597300e4 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8a3ad99763929d2783147814e44fa9ec7e7efb7b99949e3580f23c38fb5d971
-size 9398
+oid sha256:21aee17ee9a292bb2f0d3d2ec2db565ebb8d5df753454a5a002f033ed5ed39c5
+size 3853
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en.png
index 5c597300e4..f8a1f24b34 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21aee17ee9a292bb2f0d3d2ec2db565ebb8d5df753454a5a002f033ed5ed39c5
-size 3853
+oid sha256:1342b6427f5b2e3075ae3ccee60bf1d3b11afaccf3e152643d6ef2d65c21b54e
+size 9108
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en.png
index d47bf90664..4ae7279fe7 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:520cae2544153ba45f8fe4b021286c2d22da06aa1b60be7f1b13879723ff994c
-size 3664
+oid sha256:410a8596d4c70b9a3856d959d6d71ade8e831e8581ff410c9900957a93b3eb50
+size 8114
diff --git a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en.png
index a87d89c701..d47bf90664 100644
--- a/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roommembermoderation.impl_RoomMemberModerationView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f3a0cb5d9bae6725a1c527f3d9575aabf85d3edf63a28d9faa23f4f0b65e2d0
-size 7624
+oid sha256:520cae2544153ba45f8fe4b021286c2d22da06aa1b60be7f1b13879723ff994c
+size 3664
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png
index ee5c582240..58546b8522 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75de341f705bb22955f9399180519b65ad59c2e1917317d56e50ea4db78f35bc
-size 12102
+oid sha256:30357bf18792db5ab20085010251170a724ffe8c00313facd04ee704e806af64
+size 10982
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en.png
index 52fd9b9693..fedead0fa8 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58b9491aaa5554b89d86c62a5c9c44975367538c6baa5562f8dc5768f76d8264
-size 8705
+oid sha256:4811667dec0f32accc5e2c8a5dd5c0b34017fcff8d1e0376ee7a4708426bca0f
+size 9838
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en.png
index 38ad0e4b56..83302d6ba4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:326d59cf768b2dbd96eb7964d54c8eda509a5cd57c6e62087625e3314da0bb4d
-size 13658
+oid sha256:16dee1dfe746cd40dac9fe8f0af3ecb42cd14bab5cc490917b589beed065ed1b
+size 14686
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png
index 687e0d436a..4da2a98aca 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d57df7110371c9224e232b707d6a1b10ce14afcb56c803a78220792f2a0d4cf2
-size 11354
+oid sha256:ef0dc4d53daeb986f378b6e4d85928b4b6729336c89cf21e642c88c53688a3ab
+size 10292

From 6cb4343081cc75abbe91786875b7f0afc23ad275 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 24 Sep 2026 17:13:00 +0200
Subject: [PATCH 19/20] Add a script to end all the sessions of a Matrix
 account using MAS

The script logs in to MAS with the web login form (username and password),
then uses the MAS GraphQL API to end all the active compat, OAuth 2.0 and
browser sessions of the account. MAS pagination of browser sessions does not
always progress, so sessions are fetched and ended in batches until none are
left.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
---
 tools/mas/delete_all_sessions.py | 296 +++++++++++++++++++++++++++++++
 1 file changed, 296 insertions(+)
 create mode 100755 tools/mas/delete_all_sessions.py

diff --git a/tools/mas/delete_all_sessions.py b/tools/mas/delete_all_sessions.py
new file mode 100755
index 0000000000..a346e544e6
--- /dev/null
+++ b/tools/mas/delete_all_sessions.py
@@ -0,0 +1,296 @@
+#!/usr/bin/env python3
+
+# Copyright (c) 2026 Element Creations Ltd.
+#
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+
+"""End all the sessions of a Matrix account, using MAS (Matrix Authentication Service).
+
+The script logs in to MAS using the web login form (username and password), and then uses
+the MAS GraphQL API with the obtained browser session cookie to list and end all the active
+compatibility sessions, OAuth 2.0 sessions and browser sessions of the account.
+
+Requirements:
+- MAS password login must be enabled, with no captcha on the login form.
+- Python package `requests`.
+"""
+
+from __future__ import annotations
+
+import argparse
+import getpass
+import os
+import re
+import sys
+import time
+from dataclasses import dataclass
+
+import requests
+
+PAGE_SIZE = 100
+# Timeout in seconds for each HTTP request, so that the script never hangs forever.
+TIMEOUT = 30
+
+SESSION_TYPES = {
+    # type: (User field, node fields, mutation, input field)
+    "compat": ("compatSessions", "id deviceId lastActiveAt", "endCompatSession", "compatSessionId"),
+    "oauth2": ("oauth2Sessions", "id lastActiveAt client { clientName clientId }", "endOauth2Session", "oauth2SessionId"),
+    "browser": ("browserSessions", "id lastActiveAt userAgent { raw }", "endBrowserSession", "browserSessionId"),
+}
+
+
+@dataclass
+class MasSession:
+    type: str
+    id: str
+    description: str
+    last_active_at: str | None
+
+
+# Set by the --verbose option.
+verbose_logs = False
+
+
+def log(message: str, verbose: bool = False) -> None:
+    """Log a message. Verbose messages are only displayed with the --verbose option."""
+    if verbose and not verbose_logs:
+        return
+    print(f"[{time.strftime('%H:%M:%S')}] {message}", flush=True)
+
+
+class MasClient:
+    def __init__(self, mas_url: str):
+        self.mas_url = mas_url.rstrip("/")
+        self.http = requests.Session()
+
+    def login(self, username: str, password: str) -> None:
+        log(f"Fetching the login form from {self.mas_url}/login", verbose=True)
+        response = self.http.get(f"{self.mas_url}/login", timeout=TIMEOUT)
+        log(f"Got HTTP {response.status_code}", verbose=True)
+        response.raise_for_status()
+        match = re.search(r'name="csrf"\s+value="([^"]+)"', response.text) or re.search(r'value="([^"]+)"\s+name="csrf"', response.text)
+        if not match:
+            raise RuntimeError("Could not find the CSRF token in the MAS login form. Is password login enabled?")
+        log(f"Submitting the login form for {username}", verbose=True)
+        response = self.http.post(
+            f"{self.mas_url}/login",
+            data={"csrf": match.group(1), "username": username, "password": password},
+            allow_redirects=False,
+            timeout=TIMEOUT,
+        )
+        log(f"Got HTTP {response.status_code}", verbose=True)
+        # On success MAS redirects, on failure it renders the login form again.
+        if not response.is_redirect:
+            raise RuntimeError(f"Login failed (HTTP {response.status_code}). Check the username and password.")
+        log(f"Logged in, redirected to {response.headers.get('location')}")
+
+    def graphql(self, query: str, variables: dict | None = None) -> dict:
+        response = self.http.post(f"{self.mas_url}/graphql", json={"query": query, "variables": variables or {}}, timeout=TIMEOUT)
+        log(f"GraphQL request done: HTTP {response.status_code}", verbose=True)
+        response.raise_for_status()
+        body = response.json()
+        if body.get("errors"):
+            raise RuntimeError(f"GraphQL error: {body['errors']}")
+        return body["data"]
+
+    def current_browser_session_id(self) -> str | None:
+        log("Fetching the current browser session", verbose=True)
+        data = self.graphql("query { viewerSession { __typename ... on BrowserSession { id } } }")
+        return data["viewerSession"].get("id")
+
+    def list_sessions(self, session_type: str) -> tuple[list[MasSession], bool]:
+        """Return the active sessions of the given type, and whether the list is complete."""
+        field, node_fields, _, _ = SESSION_TYPES[session_type]
+        query = f"""
+            query ($first: Int!, $after: String) {{
+              viewer {{
+                __typename
+                ... on User {{
+                  {field}(state: ACTIVE, first: $first, after: $after) {{
+                    edges {{ node {{ {node_fields} }} }}
+                    pageInfo {{ hasNextPage endCursor }}
+                  }}
+                }}
+              }}
+            }}
+        """
+        sessions: dict[str, MasSession] = {}
+        after = None
+        while True:
+            log(f"Fetching a page of active {session_type} sessions after cursor {after}", verbose=True)
+            viewer = self.graphql(query, {"first": PAGE_SIZE, "after": after})["viewer"]
+            if viewer["__typename"] != "User":
+                raise RuntimeError("Not logged in to MAS.")
+            connection = viewer[field]
+            new_count = 0
+            for edge in connection["edges"]:
+                session = to_mas_session(session_type, edge["node"])
+                if session.id not in sessions:
+                    sessions[session.id] = session
+                    new_count += 1
+            page_info = connection["pageInfo"]
+            log(
+                f"Got {len(connection['edges'])} {session_type} session(s), {new_count} new, {len(sessions)} found so far, "
+                f"hasNextPage: {page_info['hasNextPage']}, endCursor: {page_info['endCursor']}",
+                verbose=True,
+            )
+            if not page_info["hasNextPage"]:
+                log(f"Found {len(sessions)} active {session_type} session(s)", verbose=True)
+                return list(sessions.values()), True
+            # MAS can return the same results again for the next page (seen with browser sessions), which would loop forever.
+            if new_count == 0 or page_info["endCursor"] in (None, after):
+                log(f"Pagination of {session_type} sessions is not progressing, stopping at {len(sessions)} session(s)", verbose=True)
+                return list(sessions.values()), False
+            after = page_info["endCursor"]
+
+    def list_all_sessions(self) -> tuple[list[MasSession], bool]:
+        """Return the active sessions of all types, and whether the list is complete."""
+        all_sessions = []
+        all_complete = True
+        for session_type in SESSION_TYPES:
+            sessions, complete = self.list_sessions(session_type)
+            all_sessions += sessions
+            all_complete = all_complete and complete
+        return all_sessions, all_complete
+
+    def end_session(self, session: MasSession) -> str:
+        _, _, mutation, input_field = SESSION_TYPES[session.type]
+        query = f"""
+            mutation ($id: ID!) {{
+              {mutation}(input: {{ {input_field}: $id }}) {{ status }}
+            }}
+        """
+        log(f"Ending {session.type} session {session.id} ({session.description})", verbose=True)
+        status = self.graphql(query, {"id": session.id})[mutation]["status"]
+        log(f"Status: {status}", verbose=True)
+        return status
+
+
+def to_mas_session(session_type: str, node: dict) -> MasSession:
+    if session_type == "compat":
+        description = f"device {node.get('deviceId')}"
+    elif session_type == "oauth2":
+        client = node.get("client") or {}
+        description = client.get("clientName") or client.get("clientId") or "unknown client"
+    else:
+        description = (node.get("userAgent") or {}).get("raw") or "unknown user agent"
+    return MasSession(session_type, node["id"], description, node.get("lastActiveAt"))
+
+
+def discover_mas_url(homeserver: str) -> str:
+    server = homeserver if homeserver.startswith("http") else f"https://{homeserver}"
+    server = server.rstrip("/")
+    base_url = server
+    log(f"Fetching {server}/.well-known/matrix/client", verbose=True)
+    try:
+        response = requests.get(f"{server}/.well-known/matrix/client", timeout=10)
+        if response.ok:
+            base_url = response.json().get("m.homeserver", {}).get("base_url", server).rstrip("/")
+        log(f"Got HTTP {response.status_code}, homeserver base URL: {base_url}", verbose=True)
+    except (requests.RequestException, ValueError) as e:
+        log(f"Could not read the .well-known file ({e}), using {base_url}", verbose=True)
+    for path in ("/_matrix/client/v1/auth_metadata", "/_matrix/client/unstable/org.matrix.msc2965/auth_metadata"):
+        log(f"Fetching {base_url}{path}", verbose=True)
+        response = requests.get(f"{base_url}{path}", timeout=10)
+        log(f"Got HTTP {response.status_code}", verbose=True)
+        if response.ok:
+            return response.json()["issuer"]
+    raise RuntimeError(f"Could not discover the MAS URL from {base_url}. Is the homeserver using MAS? Use --mas-url otherwise.")
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(description="End all the sessions of a Matrix account, using MAS.")
+    parser.add_argument("--homeserver", help="Homeserver name or URL, e.g. matrix.example.org. Used to discover the MAS URL.")
+    parser.add_argument("--mas-url", help="MAS URL, e.g. https://account.example.org. Overrides the discovery.")
+    parser.add_argument("--username", required=True, help="Username (localpart) of the account.")
+    parser.add_argument("--password", help="Password of the account. Defaults to the MAS_PASSWORD env variable, or prompted.")
+    parser.add_argument("--dry-run", action="store_true", help="Only list the sessions, do not end them.")
+    parser.add_argument("--keep-browser-session", action="store_true", help="Do not end the browser session created by this script.")
+    parser.add_argument("--verbose", action="store_true", help="Log every request and every session, and list all the sessions.")
+    args = parser.parse_args()
+
+    global verbose_logs
+    verbose_logs = args.verbose
+
+    if not args.homeserver and not args.mas_url:
+        parser.error("one of --homeserver or --mas-url is required")
+
+    password = args.password or os.environ.get("MAS_PASSWORD") or getpass.getpass(f"Password for {args.username}: ")
+
+    try:
+        mas_url = args.mas_url or discover_mas_url(args.homeserver)
+        log(f"Using MAS at {mas_url}")
+        client = MasClient(mas_url)
+        client.login(args.username, password)
+        own_session_id = client.current_browser_session_id()
+        if args.dry_run:
+            sessions, complete = client.list_all_sessions()
+    except (requests.RequestException, RuntimeError) as e:
+        print(f"Error: {e}", file=sys.stderr)
+        return 1
+
+    if args.dry_run:
+        log(f"Found {len(sessions)} active session(s)")
+        for session in sessions:
+            own = " (this script)" if session.id == own_session_id else ""
+            print(f"  {session.type:<8} {session.id}  last active: {session.last_active_at or '-':<30} {session.description}{own}")
+        if not complete:
+            log("Warning: MAS pagination is not progressing, so the list is incomplete. More sessions will be found once these are ended.")
+        return 0
+
+    # MAS pagination does not always progress, so fetch the sessions, end them, and repeat until none are left.
+    # The session used by this script is ended at the end, so that it can end all the others.
+    ended = 0
+    failed = 0
+    attempted: set[str] = set()
+    batch_number = 0
+    while True:
+        batch_number += 1
+        try:
+            sessions, complete = client.list_all_sessions()
+        except (requests.RequestException, RuntimeError) as e:
+            print(f"Error: {e}", file=sys.stderr)
+            failed += 1
+            break
+        batch = [session for session in sessions if session.id != own_session_id and session.id not in attempted]
+        if not batch:
+            if not complete:
+                log("Warning: stopping, the remaining sessions cannot be fetched because the previous ones could not be ended")
+            break
+        log(f"Batch {batch_number}: ending {len(batch)} session(s)" + ("" if complete else ", more will be fetched afterwards"))
+        for session in batch:
+            attempted.add(session.id)
+            if args.verbose:
+                print(f"  {session.type:<8} {session.id}  last active: {session.last_active_at or '-':<30} {session.description}")
+            if end_session(client, session):
+                ended += 1
+            else:
+                failed += 1
+            if (ended + failed) % PAGE_SIZE == 0:
+                log(f"Progress: {ended + failed} session(s) processed, {failed} failure(s)")
+        if complete:
+            break
+
+    if own_session_id:
+        if args.keep_browser_session:
+            log(f"Keeping browser session {own_session_id} used by this script")
+        elif end_session(client, MasSession("browser", own_session_id, "used by this script", None)):
+            ended += 1
+        else:
+            failed += 1
+
+    print(f"Ended {ended} session(s), {failed} failure(s).")
+    return 0 if failed == 0 else 1
+
+
+def end_session(client: MasClient, session: MasSession) -> bool:
+    try:
+        status = client.end_session(session)
+    except (requests.RequestException, RuntimeError) as e:
+        status = str(e)
+    if status != "ENDED":
+        print(f"Failed to end {session.type} session {session.id}: {status}", file=sys.stderr)
+    return status == "ENDED"
+
+if __name__ == "__main__":
+    sys.exit(main())

From b80a24e0aac71d1d69a7287a32d4f7fefd80675b Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Thu, 24 Sep 2026 18:01:12 +0200
Subject: [PATCH 20/20] Fix unread notification count in room list (#7749)

* Display the unread notification count only when needed

* Adjust `CounterAtom` and `UnreadIndicatorAtom` to use the official M3's `Badge` component, with a few tweaks to ensure single digit items are always displayed as a circle

* +99 is now 99+

* Update screenshots

---------

Co-authored-by: ElementBot <android@element.io>
---
 .../home/impl/components/RoomSummaryRow.kt    | 18 ++--
 .../model/RoomListRoomSummaryPreviewParam.kt  | 18 ++++
 .../designsystem/atomic/atoms/CounterAtom.kt  | 86 ++++++++++--------
 .../atomic/atoms/UnreadIndicatorAtom.kt       | 54 ++++++------
 .../components/HorizontalFloatingToolbar.kt   | 87 +++++++++++++------
 .../libraries/matrix/ui/model/InviteSender.kt |  2 +
 ...omponents_RoomListContentView_Day_0_en.png |  4 +-
 ...omponents_RoomListContentView_Day_5_en.png |  4 +-
 ...ponents_RoomListContentView_Night_0_en.png |  4 +-
 ...ponents_RoomListContentView_Night_5_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_10_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_11_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_12_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_13_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_14_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_15_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_16_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_17_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_18_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_19_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_20_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_21_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_22_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_23_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_24_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_25_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_26_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_27_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_28_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_29_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_30_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_31_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_32_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_33_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_34_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_35_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_36_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_37_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_38_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_39_en.png |  3 +
 ...pl.components_RoomSummaryRow_Day_40_en.png |  3 +
 ...pl.components_RoomSummaryRow_Day_41_en.png |  3 +
 ...pl.components_RoomSummaryRow_Day_42_en.png |  3 +
 ...pl.components_RoomSummaryRow_Day_43_en.png |  3 +
 ...pl.components_RoomSummaryRow_Day_44_en.png |  3 +
 ...pl.components_RoomSummaryRow_Day_45_en.png |  3 +
 ...pl.components_RoomSummaryRow_Day_46_en.png |  3 +
 ...pl.components_RoomSummaryRow_Day_47_en.png |  3 +
 ...pl.components_RoomSummaryRow_Day_48_en.png |  3 +
 ...pl.components_RoomSummaryRow_Day_49_en.png |  3 +
 ...mpl.components_RoomSummaryRow_Day_4_en.png |  4 +-
 ...pl.components_RoomSummaryRow_Day_50_en.png |  3 +
 ...mpl.components_RoomSummaryRow_Day_6_en.png |  2 +-
 ...mpl.components_RoomSummaryRow_Day_7_en.png |  4 +-
 ...mpl.components_RoomSummaryRow_Day_8_en.png |  4 +-
 ...mpl.components_RoomSummaryRow_Day_9_en.png |  4 +-
 ....components_RoomSummaryRow_Night_10_en.png |  4 +-
 ....components_RoomSummaryRow_Night_11_en.png |  4 +-
 ....components_RoomSummaryRow_Night_12_en.png |  4 +-
 ....components_RoomSummaryRow_Night_13_en.png |  4 +-
 ....components_RoomSummaryRow_Night_14_en.png |  4 +-
 ....components_RoomSummaryRow_Night_15_en.png |  4 +-
 ....components_RoomSummaryRow_Night_16_en.png |  4 +-
 ....components_RoomSummaryRow_Night_17_en.png |  4 +-
 ....components_RoomSummaryRow_Night_18_en.png |  4 +-
 ....components_RoomSummaryRow_Night_19_en.png |  4 +-
 ....components_RoomSummaryRow_Night_20_en.png |  4 +-
 ....components_RoomSummaryRow_Night_21_en.png |  4 +-
 ....components_RoomSummaryRow_Night_22_en.png |  4 +-
 ....components_RoomSummaryRow_Night_23_en.png |  4 +-
 ....components_RoomSummaryRow_Night_24_en.png |  4 +-
 ....components_RoomSummaryRow_Night_25_en.png |  4 +-
 ....components_RoomSummaryRow_Night_26_en.png |  4 +-
 ....components_RoomSummaryRow_Night_27_en.png |  4 +-
 ....components_RoomSummaryRow_Night_28_en.png |  4 +-
 ....components_RoomSummaryRow_Night_29_en.png |  4 +-
 ....components_RoomSummaryRow_Night_30_en.png |  4 +-
 ....components_RoomSummaryRow_Night_31_en.png |  4 +-
 ....components_RoomSummaryRow_Night_32_en.png |  4 +-
 ....components_RoomSummaryRow_Night_33_en.png |  4 +-
 ....components_RoomSummaryRow_Night_34_en.png |  4 +-
 ....components_RoomSummaryRow_Night_35_en.png |  4 +-
 ....components_RoomSummaryRow_Night_36_en.png |  4 +-
 ....components_RoomSummaryRow_Night_37_en.png |  4 +-
 ....components_RoomSummaryRow_Night_38_en.png |  4 +-
 ....components_RoomSummaryRow_Night_39_en.png |  3 +
 ....components_RoomSummaryRow_Night_40_en.png |  3 +
 ....components_RoomSummaryRow_Night_41_en.png |  3 +
 ....components_RoomSummaryRow_Night_42_en.png |  3 +
 ....components_RoomSummaryRow_Night_43_en.png |  3 +
 ....components_RoomSummaryRow_Night_44_en.png |  3 +
 ....components_RoomSummaryRow_Night_45_en.png |  3 +
 ....components_RoomSummaryRow_Night_46_en.png |  3 +
 ....components_RoomSummaryRow_Night_47_en.png |  3 +
 ....components_RoomSummaryRow_Night_48_en.png |  3 +
 ....components_RoomSummaryRow_Night_49_en.png |  3 +
 ...l.components_RoomSummaryRow_Night_4_en.png |  4 +-
 ....components_RoomSummaryRow_Night_50_en.png |  3 +
 ...l.components_RoomSummaryRow_Night_6_en.png |  4 +-
 ...l.components_RoomSummaryRow_Night_7_en.png |  4 +-
 ...l.components_RoomSummaryRow_Night_8_en.png |  2 +-
 ...l.components_RoomSummaryRow_Night_9_en.png |  4 +-
 ....search_RoomListSearchContent_Day_1_en.png |  4 +-
 ...earch_RoomListSearchContent_Night_1_en.png |  4 +-
 ...me.impl.spaces_HomeSpacesView_Day_0_en.png |  4 +-
 ....impl.spaces_HomeSpacesView_Night_0_en.png |  4 +-
 .../features.home.impl_HomeViewA11y_en.png    |  4 +-
 .../features.home.impl_HomeView_Day_0_en.png  |  4 +-
 .../features.home.impl_HomeView_Day_10_en.png |  4 +-
 .../features.home.impl_HomeView_Day_11_en.png |  4 +-
 .../features.home.impl_HomeView_Day_13_en.png |  4 +-
 .../features.home.impl_HomeView_Day_14_en.png |  4 +-
 .../features.home.impl_HomeView_Day_15_en.png |  4 +-
 .../features.home.impl_HomeView_Day_16_en.png |  4 +-
 .../features.home.impl_HomeView_Day_1_en.png  |  4 +-
 .../features.home.impl_HomeView_Day_2_en.png  |  4 +-
 .../features.home.impl_HomeView_Day_3_en.png  |  4 +-
 .../features.home.impl_HomeView_Day_4_en.png  |  4 +-
 .../features.home.impl_HomeView_Day_5_en.png  |  4 +-
 .../features.home.impl_HomeView_Day_6_en.png  |  4 +-
 .../features.home.impl_HomeView_Day_7_en.png  |  4 +-
 .../features.home.impl_HomeView_Day_8_en.png  |  4 +-
 .../features.home.impl_HomeView_Day_9_en.png  |  4 +-
 ...features.home.impl_HomeView_Night_0_en.png |  4 +-
 ...eatures.home.impl_HomeView_Night_10_en.png |  4 +-
 ...eatures.home.impl_HomeView_Night_11_en.png |  4 +-
 ...eatures.home.impl_HomeView_Night_13_en.png |  4 +-
 ...eatures.home.impl_HomeView_Night_14_en.png |  4 +-
 ...eatures.home.impl_HomeView_Night_15_en.png |  4 +-
 ...eatures.home.impl_HomeView_Night_16_en.png |  4 +-
 ...features.home.impl_HomeView_Night_1_en.png |  4 +-
 ...features.home.impl_HomeView_Night_2_en.png |  4 +-
 ...features.home.impl_HomeView_Night_3_en.png |  4 +-
 ...features.home.impl_HomeView_Night_4_en.png |  4 +-
 ...features.home.impl_HomeView_Night_5_en.png |  4 +-
 ...features.home.impl_HomeView_Night_6_en.png |  4 +-
 ...features.home.impl_HomeView_Night_7_en.png |  4 +-
 ...features.home.impl_HomeView_Night_8_en.png |  4 +-
 ...features.home.impl_HomeView_Night_9_en.png |  4 +-
 ...wWithReadMarkerBothIndicators_Day_0_en.png |  4 +-
 ...ithReadMarkerBothIndicators_Night_0_en.png |  4 +-
 ...rkerJumpToUnreadIndicatorOnly_Day_0_en.png |  4 +-
 ...erJumpToUnreadIndicatorOnly_Night_0_en.png |  4 +-
 ...roomdetails.impl_RoomDetailsDark_15_en.png |  4 +-
 ...res.roomdetails.impl_RoomDetails_15_en.png |  4 +-
 ...res.space.impl.root_SpaceView_Day_3_en.png |  4 +-
 ...res.space.impl.root_SpaceView_Day_4_en.png |  4 +-
 ...s.space.impl.root_SpaceView_Night_3_en.png |  4 +-
 ...s.space.impl.root_SpaceView_Night_4_en.png |  4 +-
 ...stem.atomic.atoms_CounterAtom_Day_0_en.png |  4 +-
 ...em.atomic.atoms_CounterAtom_Night_0_en.png |  4 +-
 ...mic.atoms_UnreadIndicatorAtom_Day_0_en.png |  4 +-
 ...c.atoms_UnreadIndicatorAtom_Night_0_en.png |  4 +-
 ...orizontalFloatingToolbarNoFab_Day_0_en.png |  4 +-
 ...izontalFloatingToolbarNoFab_Night_0_en.png |  4 +-
 ...nts_HorizontalFloatingToolbar_Day_0_en.png |  4 +-
 ...s_HorizontalFloatingToolbar_Night_0_en.png |  4 +-
 ...e.components_NavigationBar_App_Bars_en.png |  4 +-
 ....components_SpaceRoomItemView_Day_3_en.png |  4 +-
 ....components_SpaceRoomItemView_Day_4_en.png |  4 +-
 ....components_SpaceRoomItemView_Day_7_en.png |  4 +-
 ...omponents_SpaceRoomItemView_Night_3_en.png |  4 +-
 ...omponents_SpaceRoomItemView_Night_4_en.png |  4 +-
 ...omponents_SpaceRoomItemView_Night_7_en.png |  4 +-
 164 files changed, 504 insertions(+), 365 deletions(-)
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_39_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_40_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_41_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_42_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_43_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_44_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_45_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_46_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_47_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_48_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_49_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_50_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_39_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_40_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_41_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_42_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_43_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_44_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_45_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_46_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_47_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_48_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_49_en.png
 create mode 100644 tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_50_en.png

diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
index 883d8aff76..4b60e9e684 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomSummaryRow.kt
@@ -345,7 +345,7 @@ private fun MessagePreviewAndIndicatorRow(
         // Call and unread
         Row(
             modifier = Modifier
-                .height(16.dp)
+                .heightIn(min = 16.dp)
                 // Used to force this line to be read aloud earlier than the latest event when using Talkback
                 .zIndex(-1f),
             horizontalArrangement = Arrangement.spacedBy(8.dp),
@@ -358,21 +358,18 @@ private fun MessagePreviewAndIndicatorRow(
                     isAudio = room.activeCallIntent == CallIntent.AUDIO
                 )
             }
-            if (room.userDefinedNotificationMode == RoomNotificationMode.MUTE) {
+            val isMuted = room.userDefinedNotificationMode == RoomNotificationMode.MUTE
+            if (isMuted) {
                 NotificationOffIndicatorAtom()
             } else if (room.numberOfUnreadMentions > 0) {
                 MentionIndicatorAtom()
             }
             if (room.hasNewContent) {
                 val contentDescription = stringResource(CommonStrings.a11y_notifications_new_messages)
-                val count = if (showUnreadCount) {
-                    if (room.userDefinedNotificationMode == RoomNotificationMode.MUTE) {
-                        room.numberOfUnreadMessages
-                    } else {
-                        room.numberOfUnreadNotifications
-                    }
-                } else {
-                    null
+                val count = when {
+                    showUnreadCount && !isMuted && room.numberOfUnreadNotifications > 0 -> room.numberOfUnreadNotifications
+                    !showUnreadCount -> 0
+                    else -> null
                 }
                 UnreadIndicatorAtom(
                     color = tint,
@@ -457,5 +454,6 @@ internal fun RoomSummaryRowPreview(@PreviewParameter(RoomListRoomSummaryPreviewP
         isInviteSeen = data.name == "Bob",
         onClick = {},
         eventSink = {},
+        showUnreadCount = data.numberOfUnreadNotifications > 0,
     )
 }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryPreviewParam.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryPreviewParam.kt
index c04c3e446b..17b35c3b42 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryPreviewParam.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/model/RoomListRoomSummaryPreviewParam.kt
@@ -82,6 +82,24 @@ open class RoomListRoomSummaryPreviewParam : PreviewParameterProvider<RoomListRo
                             numberOfUnreadMentions = 1,
                             hasRoomCall = hasCall,
                         ),
+                        aRoomListRoomSummary(
+                            name = roomNotificationMode.name,
+                            latestEvent = LatestEvent.Synced("New notifications" + if (hasCall) ", call" else ""),
+                            notificationMode = roomNotificationMode,
+                            numberOfUnreadMessages = 0,
+                            numberOfUnreadMentions = 0,
+                            numberOfUnreadNotifications = 1,
+                            hasRoomCall = hasCall,
+                        ),
+                        aRoomListRoomSummary(
+                            name = roomNotificationMode.name,
+                            latestEvent = LatestEvent.Synced("New notifications" + if (hasCall) ", call" else ""),
+                            notificationMode = roomNotificationMode,
+                            numberOfUnreadMessages = 0,
+                            numberOfUnreadMentions = 0,
+                            numberOfUnreadNotifications = 100,
+                            hasRoomCall = hasCall,
+                        ),
                     )
                 }.flatten()
             }.flatten(),
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/CounterAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/CounterAtom.kt
index 3bbd3c12a7..ef6a71cc90 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/CounterAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/CounterAtom.kt
@@ -8,39 +8,43 @@
 
 package io.element.android.libraries.designsystem.atomic.atoms
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement.spacedBy
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.sizeIn
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.rememberTextMeasurer
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.coerceAtLeast
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.SemanticColors
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.toDp
 import io.element.android.libraries.designsystem.theme.components.Text
 
 private const val MAX_COUNT = 99
-private const val MAX_COUNT_STRING = "+$MAX_COUNT"
+private const val MAX_COUNT_STRING = "$MAX_COUNT+"
 
 /**
  * A counter atom that displays a number in a circle.
  * Figma link : https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=2805-2649&m=dev
  *
  * @param count The number to display. If the number is greater than [MAX_COUNT], the counter will display [MAX_COUNT_STRING].
- * If the number is less than 1, the counter will not be displayed.
+ * If the number is less than 1, just a dot will be displayed instead.
  * @param modifier The modifier to apply to this layout.
  * @param containerColor The background color of the counter. When null, uses [isCritical] to pick a default.
- * @param contentColor The text color inside the counter. When null, uses [textOnSolidPrimary].
+ * @param contentColor The text color inside the counter. When null, uses [SemanticColors.textOnSolidPrimary].
+ * @param contentPadding The padding to apply to the text inside the counter.
  * @param textStyle The style to apply to the text inside the counter.
+ * @param dotSize The size of the dot when [count] is less than 1. It defaults to `12.0.dp`.
  * @param isCritical If true, the counter will use a critical color scheme, otherwise it will use an accent color scheme.
  * Only used when [containerColor] is null.
  */
@@ -50,41 +54,51 @@ fun CounterAtom(
     modifier: Modifier = Modifier,
     containerColor: Color? = null,
     contentColor: Color? = null,
+    contentPadding: PaddingValues = PaddingValues.Zero,
     textStyle: TextStyle = CounterAtomDefaults.textStyle,
+    dotSize: Dp = 12.0.dp,
     isCritical: Boolean = false,
 ) {
-    if (count < 1) return
     val countAsText = when (count) {
-        in 0..MAX_COUNT -> count.toString()
+        in Int.MIN_VALUE..0 -> null
+        in 1..MAX_COUNT -> count.toString()
         else -> MAX_COUNT_STRING
     }
-    val textMeasurer = rememberTextMeasurer()
-    // Measure the maximum count string size
-    val textLayoutResult = textMeasurer.measure(
-        text = MAX_COUNT_STRING,
-        style = textStyle
-    )
-    val textSize = textLayoutResult.size
-    val squareSize = maxOf(textSize.width, textSize.height)
-    Box(
-        modifier = modifier
-            .size(squareSize.toDp() + 1.dp)
-            .clip(CircleShape)
-            .background(
-                containerColor ?: if (isCritical) {
-                    ElementTheme.colors.iconCriticalPrimary
-                } else {
-                    ElementTheme.colors.iconAccentPrimary
-                }
-            )
-    ) {
-        Text(
-            modifier = Modifier.align(Alignment.Center),
+
+    val minSingleDigitSize = if (countAsText?.length == 1) {
+        val textMeasurer = rememberTextMeasurer()
+        // Measure the maximum count string size
+        val textLayoutResult = textMeasurer.measure(
             text = countAsText,
-            style = textStyle,
-            color = contentColor ?: ElementTheme.colors.textOnSolidPrimary,
+            style = textStyle
         )
+        val textSize = textLayoutResult.size
+        maxOf(textSize.width, textSize.height)
+    } else {
+        0
     }
+
+    androidx.compose.material3.Badge(
+        modifier = modifier.then(
+            if (countAsText == null) Modifier.sizeIn(minWidth = dotSize, minHeight = dotSize) else Modifier
+        ),
+        containerColor = containerColor ?: if (isCritical) ElementTheme.colors.iconCriticalPrimary else ElementTheme.colors.iconAccentPrimary,
+        contentColor = contentColor ?: ElementTheme.colors.textOnSolidPrimary,
+        content = countAsText?.let {
+            @Composable {
+                Text(
+                    modifier = Modifier.sizeIn(
+                        minWidth = (minSingleDigitSize.toDp() - 8.dp).coerceAtLeast(0.dp),
+                        minHeight = minSingleDigitSize.toDp()
+                    ).padding(contentPadding),
+                    text = countAsText,
+                    style = textStyle,
+                    color = contentColor ?: ElementTheme.colors.textOnSolidPrimary,
+                    textAlign = TextAlign.Center,
+                )
+            }
+        }
+    )
 }
 
 object CounterAtomDefaults {
@@ -95,7 +109,7 @@ object CounterAtomDefaults {
 @PreviewsDayNight
 @Composable
 internal fun CounterAtomPreview() = ElementPreview {
-    Column(verticalArrangement = spacedBy(2.dp)) {
+    Row(horizontalArrangement = spacedBy(2.dp), verticalAlignment = Alignment.CenterVertically) {
         CounterAtom(count = 0)
         CounterAtom(count = 4)
         CounterAtom(count = 99)
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/UnreadIndicatorAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/UnreadIndicatorAtom.kt
index bdf039edb8..332621bba5 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/UnreadIndicatorAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/UnreadIndicatorAtom.kt
@@ -9,15 +9,16 @@
 package io.element.android.libraries.designsystem.atomic.atoms
 
 import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
@@ -37,35 +38,36 @@ fun UnreadIndicatorAtom(
     isVisible: Boolean = true,
     contentDescription: String? = null,
     border: BorderStroke? = null,
+    contentPadding: PaddingValues = PaddingValues.Zero,
 ) {
     when {
         !isVisible -> Spacer(modifier = modifier.size(size))
-        count != null && count >= 1 -> CounterAtom(
-            count = count.toInt(),
-            modifier = modifier
-                .semantics {
-                    contentDescription?.let { this.contentDescription = it }
-                }
-                .then(if (border != null) Modifier.border(border, CircleShape) else Modifier),
-            containerColor = color,
-            contentColor = ElementTheme.colors.bgCanvasDefault,
-            textStyle = ElementTheme.typography.fontBodySmMedium,
-        )
-        else -> Box(
-            modifier = modifier
-                .semantics {
-                    contentDescription?.let { this.contentDescription = it }
-                }
-                .size(size)
-                .clip(CircleShape)
-                .background(color)
-                .then(if (border != null) Modifier.border(border, CircleShape) else Modifier),
-        )
+        else -> count?.let {
+            CounterAtom(
+                count = count.toInt(),
+                modifier = modifier
+                    .semantics {
+                        contentDescription?.let { this.contentDescription = it }
+                    }
+                    .then(if (border != null) Modifier.border(border, RoundedCornerShape(percent = 50)) else Modifier),
+                containerColor = color,
+                contentColor = ElementTheme.colors.bgCanvasDefault,
+                textStyle = ElementTheme.typography.fontBodySmMedium,
+                contentPadding = contentPadding,
+            )
+        }
     }
 }
 
 @PreviewsDayNight
 @Composable
 internal fun UnreadIndicatorAtomPreview() = ElementPreview {
-    UnreadIndicatorAtom()
+    Row(horizontalArrangement = Arrangement.spacedBy(2.dp), verticalAlignment = Alignment.CenterVertically) {
+        UnreadIndicatorAtom(count = null)
+        UnreadIndicatorAtom(count = 0)
+        UnreadIndicatorAtom(count = 1)
+        UnreadIndicatorAtom(count = 10)
+        UnreadIndicatorAtom(count = 99)
+        UnreadIndicatorAtom(count = 999)
+    }
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/HorizontalFloatingToolbar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/HorizontalFloatingToolbar.kt
index 8cdb320d30..74cdc33f17 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/HorizontalFloatingToolbar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/HorizontalFloatingToolbar.kt
@@ -8,17 +8,18 @@
 package io.element.android.libraries.designsystem.theme.components
 
 import androidx.compose.animation.core.FiniteAnimationSpec
-import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
+import androidx.compose.material3.BadgedBox
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
-import androidx.compose.material3.FilledIconButton
 import androidx.compose.material3.FloatingToolbarColors
 import androidx.compose.material3.FloatingToolbarDefaults
 import androidx.compose.material3.FloatingToolbarHorizontalFabPosition
@@ -28,7 +29,6 @@ import androidx.compose.material3.TooltipAnchorPosition
 import androidx.compose.material3.TooltipDefaults
 import androidx.compose.material3.rememberTooltipState
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
@@ -139,8 +139,20 @@ fun HorizontalFloatingToolbarItem(
                 contentColor = ElementTheme.colors.iconSecondary,
             )
         }
-        Box {
-            FilledIconButton(
+        BadgedBox(
+            badge = {
+                counter?.let {
+                    CounterAtom(
+                        count = it,
+                        // Tweak the offset so it's centered on the icon
+                        modifier = Modifier.offset(x = (-16).dp, y = 10.dp),
+                        contentPadding = PaddingValues(vertical = 0.5.dp),
+                        textStyle = ElementTheme.typography.fontBodySmMedium,
+                    )
+                }
+            }
+        ) {
+            IconButton(
                 modifier = Modifier.widthIn(min = 56.dp),
                 colors = colors,
                 onClick = onClick,
@@ -151,15 +163,6 @@ fun HorizontalFloatingToolbarItem(
                     contentDescription = tooltipLabel,
                 )
             }
-            if (counter != null) {
-                CounterAtom(
-                    modifier = Modifier
-                        .align(Alignment.TopEnd)
-                        .padding(top = 6.dp, end = 3.dp),
-                    count = counter,
-                    textStyle = ElementTheme.typography.fontBodyXsMedium,
-                )
-            }
         }
     }
 }
@@ -172,18 +175,47 @@ fun HorizontalFloatingToolbarSeparator(modifier: Modifier = Modifier) {
 @PreviewsDayNight
 @Composable
 internal fun HorizontalFloatingToolbarPreview() = ElementPreview {
-    ContentToPreview(
-        floatingActionButton = {
-            FloatingActionButton(
-                onClick = {},
-            ) {
-                Icon(
-                    imageVector = CompoundIcons.Plus(),
-                    contentDescription = null,
-                )
+    Column {
+        ContentToPreview(
+            count = 1,
+            floatingActionButton = {
+                FloatingActionButton(
+                    onClick = {},
+                ) {
+                    Icon(
+                        imageVector = CompoundIcons.Plus(),
+                        contentDescription = null,
+                    )
+                }
             }
-        }
-    )
+        )
+        ContentToPreview(
+            count = 99,
+            floatingActionButton = {
+                FloatingActionButton(
+                    onClick = {},
+                ) {
+                    Icon(
+                        imageVector = CompoundIcons.Plus(),
+                        contentDescription = null,
+                    )
+                }
+            }
+        )
+        ContentToPreview(
+            count = 999,
+            floatingActionButton = {
+                FloatingActionButton(
+                    onClick = {},
+                ) {
+                    Icon(
+                        imageVector = CompoundIcons.Plus(),
+                        contentDescription = null,
+                    )
+                }
+            }
+        )
+    }
 }
 
 @PreviewsDayNight
@@ -197,10 +229,11 @@ internal fun HorizontalFloatingToolbarNoFabPreview() = ElementPreview {
 @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class)
 @Composable
 private fun ContentToPreview(
+    count: Int? = 6,
     floatingActionButton: (@Composable () -> Unit)?,
 ) {
     HorizontalFloatingToolbar(
-        modifier = Modifier.padding(28.dp),
+        modifier = Modifier.padding(horizontal = 28.dp, vertical = 16.dp),
         floatingActionButton = floatingActionButton,
     ) {
         listOf(
@@ -214,7 +247,7 @@ private fun ContentToPreview(
                 icon = icon,
                 tooltipLabel = "Label",
                 isSelected = index == 0,
-                counter = if (index == 0) 6 else null,
+                counter = if (index == 0) count else null,
                 forceRenderingTooltip = true,
                 onClick = { },
             )
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/InviteSender.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/InviteSender.kt
index dd8655af26..a6798a377b 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/InviteSender.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/InviteSender.kt
@@ -9,6 +9,7 @@
 package io.element.android.libraries.matrix.ui.model
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.SpanStyle
@@ -20,6 +21,7 @@ import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.ui.R
 
+@Immutable
 data class InviteSender(
     val userId: UserId,
     val displayName: String,
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_0_en.png
index c6103fdd16..c0c294db16 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1da296f6409e018bf6e36d4bf8d0183327e2da1730008721476397a3398a2e13
-size 41382
+oid sha256:58f1c38a10296a805aceb39915422defa97db88865be2f131433ba1c0115a487
+size 41012
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_5_en.png
index 1f93f01826..4be85a8039 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7456163ece98c73691a5147e3c7b183189a545389699bb9fe33a8ce68bb125e3
-size 59685
+oid sha256:f2d58c06e6ce7b699efde5ad9eb34a4bb60a2fb6885f627332067e117bbd3ea6
+size 59287
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_0_en.png
index 73c8da0c71..f7df2499a3 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbfb4004f0c9b017a86096d9a45c1793ef32d5117f6a17c59a41920264e95399
-size 41099
+oid sha256:a6ef632e6e57853a4b5b4c0c2c783ae3324a00924adf9ff3ebbdfe54b971c19e
+size 40769
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_5_en.png
index f293dd7cfd..1fea73a64c 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomListContentView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:683568f509c83c24f506924e7a715f6ff9530d3f6ae28e041436288a510785cf
-size 58742
+oid sha256:3b04ac3279b631f5f7f580f0f440c1b88626e776a2f20ec6946cd6c5e97a4a48
+size 58395
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_10_en.png
index 98126a3b63..f1a300b27c 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdc9960e9a2da12863e717ca0ea20b33e8253b858e80cf8115a4c90cc866cde7
-size 15062
+oid sha256:3606e61a4b4b03aa2b46217ecd8dfa32c6b54c54f832c1682be00e63af6bee7e
+size 14273
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_11_en.png
index 342a26ff41..63526122e0 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca14149a3811b23abe145aca4697d4f662a3e7415fce50fd1d2c578430fe8a30
-size 17353
+oid sha256:970c808914b817fd6becac41d758e6313f9700b9440d4ef7ef81186e023c93ec
+size 13852
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_12_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_12_en.png
index 8a469007af..5fa92d809f 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df7ba7ed437a7fc2fdf5a3e430b3947ef1b053d617781edafd9efe3847825def
-size 15546
+oid sha256:86e395874c15a1a263da0d00f407f900d8dc91e6ca60f6e9421182338a74d540
+size 15062
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_13_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_13_en.png
index 52d3e7a59f..c4935a9f83 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5720d3452f9478e99ab2e5a5d3e3e5da6a7991bbf11a18d4b40f1a6eb279e510
-size 10289
+oid sha256:5648db8c7d1b8b62ed1044c8f315c3b7512ba09f63c54dda8c4dfc7152c95341
+size 17341
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_14_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_14_en.png
index eac5a2c759..31ffb2bbff 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce2ccd0f741b7a749c56bb307be5eb46b376466164e280d373488fb6fed30496
-size 11508
+oid sha256:5e48babc8700db5a7f05d2f7bad7e1c7ad6e8feb2b37d7e14548c2e57960a737
+size 15534
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_15_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_15_en.png
index 043790eb8e..3644b2540f 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f568e9fda7f57758e59e609ac402172f151fd2b7856d758675ea93a11e00109e
-size 12850
+oid sha256:6414057df055980cd6ea73e917a2762b3f29dd73f5bac40fb5c455864abc5acb
+size 15589
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_16_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_16_en.png
index ed4e6f7f72..2701193ab9 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a915292d390b3acc3a495dae8a32fed39eb0e89cc26b73ce22f4b0dce08ccf4d
-size 11006
+oid sha256:a018d57f919ee5fc27e2e76647c043f7c2f8a07b87cffaecf78efb7c755eaa7a
+size 16210
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_17_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_17_en.png
index 989a1d8875..52d3e7a59f 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_17_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_17_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e395a758d445ba4860c1811f32fcc6a670bbf161e6d31e5dcf691a46ef57442
-size 12699
+oid sha256:5720d3452f9478e99ab2e5a5d3e3e5da6a7991bbf11a18d4b40f1a6eb279e510
+size 10289
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_18_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_18_en.png
index 7c7972a951..320c868bf8 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_18_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_18_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f989885d0d13fbf03bfbb61986ddea592033de482ba76d170a451a95ed2d7e4
-size 13891
+oid sha256:7daaa440739b575097d4edd2a168cfe413fa8324bb4dba4594c598340f0cabe1
+size 11505
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_19_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_19_en.png
index 3e150577c1..c297872d6d 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_19_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_19_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:233eaf06f35fc2cd55dd1c70f0b406065998d8ab372b590765cf6543c33285a9
-size 16337
+oid sha256:b2cd1de3bf744dd653076a195101a1adbf3b5bb633a3fbc832ddcc406fdac596
+size 12850
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_20_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_20_en.png
index 69012a57fa..438a6af0e4 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_20_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_20_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae971022be9049bc136c1e3cc659792874b5f3aa61e9848a01b8473e295308e3
-size 14338
+oid sha256:39adc1297064622fa7b4a419a2b12586bbb4961648e34865945e53a8097e6669
+size 11001
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_21_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_21_en.png
index d4c862fe89..2ebe459661 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_21_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_21_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e754a2a6528f13311639b5013dd059c8e61500e9855eab898eeebff488607587
-size 14617
+oid sha256:0a34911009ea0a3457f58d2c26a1f33ebe2ba9fea86c03ab9199437104439012
+size 11331
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_22_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_22_en.png
index bfad2f6cd6..2ebe459661 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_22_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_22_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbe51985786dddc65428c1b4b964ad36588f0a2c03cb88432b78f61ed0e51f72
-size 15818
+oid sha256:0a34911009ea0a3457f58d2c26a1f33ebe2ba9fea86c03ab9199437104439012
+size 11331
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_23_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_23_en.png
index 731b386f1b..989a1d8875 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_23_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_23_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b79da8707db7b6903ce4bdbe9788d6b78ed3ac410bbd92c7350e13f0d55cc7b
-size 18269
+oid sha256:7e395a758d445ba4860c1811f32fcc6a670bbf161e6d31e5dcf691a46ef57442
+size 12699
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_24_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_24_en.png
index 4c394049bf..4ce6942b7a 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_24_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_24_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c81e31b63ac3549e0278159538de9107537385d17ce15d40120a50b987454e85
-size 16275
+oid sha256:b224c14220ded85c0a3df8d68f7375a833579e1d7b9994c1255a145259d964fc
+size 13890
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_25_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_25_en.png
index 3a85d80fa4..49a1a56122 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_25_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_25_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:174e53280a24009753daf594e55c955c9b4192f25dd13d33bee4cfa9f32e489c
-size 11057
+oid sha256:984931bd0b2c850300f9537ae0b390726e744828598671d40aecb991fd3dbc13
+size 16332
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_26_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_26_en.png
index b58323fdff..072cc63aa0 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_26_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_26_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:91d6c9fd61f26b446938dfd0a0c0d38f6f6d2f50449ae4af4190f03b3b40b613
-size 12261
+oid sha256:effe16be8ec62fadf366bc2a85c1bc18fec59acade13adda688a3ad6e4a60fd0
+size 14329
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_27_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_27_en.png
index 31a38a1ee5..4c10d32640 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_27_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_27_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93de545bd3d959f7117cd6b37e3e77dc2933dc13a4aca25c7b2fcfc37ff9329a
-size 13736
+oid sha256:ecf99cc048e5c70b92b5c8793b7ee7c9c2b92422cd2fe02fe61ede3c09d52138
+size 14390
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_28_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_28_en.png
index 6e810d42c5..05823eb5eb 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_28_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_28_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0887b5f8d083b7fc7e8698c088714aba6581f970b04e042a3bb6ae2f8e5fa9b2
-size 11746
+oid sha256:8effb8a470b82d9eb1629aab346403d6168fb33421f4bee9ed0a8f1179c67da2
+size 15005
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_29_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_29_en.png
index 402f14d1f8..d4c862fe89 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_29_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_29_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0dec41829991e163917c3cc662a579bd71ac6be6207fdc1f1ac7eefeae3c116f
-size 20689
+oid sha256:e754a2a6528f13311639b5013dd059c8e61500e9855eab898eeebff488607587
+size 14617
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_30_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_30_en.png
index f409a80eac..b1a83b1fb3 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_30_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_30_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44f889ba419a3ae98345fa18bd3aafa72a6c54c91a2840a6ee7fc57c281f4aed
-size 15712
+oid sha256:9de543c2e12aa1346ac681d33a939a95019c4bf8afb4ac127d691ade1632b419
+size 15814
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_31_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_31_en.png
index db23cfdcf0..7f903cc541 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_31_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_31_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60af1e883967dbcb2be2a6771cda32e6d6378f4743929a6ae71dee762fb6a4d8
-size 21825
+oid sha256:a80673fea3d0853ba17887863bd4c206479bb1d7a890df99ccea44c2f717c50c
+size 18259
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_32_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_32_en.png
index 63d9190839..0b88a5fa50 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_32_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_32_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0a9a043b5ac3fd18f3c258c1a99a7debc3b7a53e1710c54362206f9edea2c78
-size 21873
+oid sha256:c208d1e4b56eb30e78110edb2153001328883f28a22a93ca1ef987852afc5e19
+size 16268
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_33_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_33_en.png
index 4b25a93c51..96dd00c634 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_33_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_33_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dc0a9bd29caced8bd28f152485eecfaf8bfce8993bd04b8c1cf59cbaf699cd46
-size 11848
+oid sha256:d7836f6e073d389af17d2df908750ceb5feaeee5f7ce8457da2044d2d20eb47c
+size 16323
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_34_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_34_en.png
index 04c6f7d8d3..5058ec9885 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_34_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_34_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bbbe8903182497155e87eff344956f2fdb348acdb78c8be6fad8f0e1718ff516
-size 17219
+oid sha256:acad0ba3537899c700d59bfb2eb530cf373e76cb63aa91e05005aef3c6f6eb48
+size 16932
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_35_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_35_en.png
index af409e4b90..3a85d80fa4 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_35_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_35_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8414dc0f6de01cddc3971dad05778461c6e8220eb2c90016d3b5ef7902c6f7d
-size 14846
+oid sha256:174e53280a24009753daf594e55c955c9b4192f25dd13d33bee4cfa9f32e489c
+size 11057
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_36_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_36_en.png
index 078ce02360..5110e03a2a 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_36_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_36_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20be0dd6e56278f168138622fdbf38d15e7161431812d0c2c4c9b3564bf81b7e
-size 12991
+oid sha256:fc800c08455487eac5c9dc7a4ebb8119a8a48f33a2288f6b31ad8f345b284255
+size 12262
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_37_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_37_en.png
index cd60ad3148..a9f31f2567 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_37_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_37_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d2dd354988f252db4877f598614ffe50b2e5f5e33c0d6c1420b07b1ecf877a8
-size 13473
+oid sha256:88ae8b45c7b1dd48e2b4a8ff07e07faed1549ae38f56d78b9a250778c848f9cc
+size 13737
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_38_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_38_en.png
index 473fd3f275..10c78cb9ba 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_38_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_38_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26071a6b16f4446526f6abf28274580eb0f385bd0e74f4f2b0479da5f5d4f6f2
-size 12914
+oid sha256:2eb84e96ac418502ec0b355ae6c9eede10deb024c2007e7cf5008def5ef3bd29
+size 11748
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_39_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_39_en.png
new file mode 100644
index 0000000000..657f9fd25d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_39_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0cd3c10fea665b6542adaa722d17e05f7600000b498d580e59bed87467102c18
+size 12036
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_40_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_40_en.png
new file mode 100644
index 0000000000..657f9fd25d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_40_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0cd3c10fea665b6542adaa722d17e05f7600000b498d580e59bed87467102c18
+size 12036
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_41_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_41_en.png
new file mode 100644
index 0000000000..1c41d22fe0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_41_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b5d23313fe6cd8f62f2413fdd9aeac7826c93624bd7c11f2bb6bd1e3345cca6
+size 20325
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_42_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_42_en.png
new file mode 100644
index 0000000000..f409a80eac
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_42_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44f889ba419a3ae98345fa18bd3aafa72a6c54c91a2840a6ee7fc57c281f4aed
+size 15712
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_43_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_43_en.png
new file mode 100644
index 0000000000..bb91f62629
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_43_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de5f496dad2300441714005a69230487a62c2808e9bd44d71965d21a7939a744
+size 21459
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_44_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_44_en.png
new file mode 100644
index 0000000000..46a43bb8ac
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_44_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e668ebebf756f6053864bdd23688722a158f58c3a234edeacfd81a9281e152ae
+size 21515
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_45_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_45_en.png
new file mode 100644
index 0000000000..4b25a93c51
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_45_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc0a9bd29caced8bd28f152485eecfaf8bfce8993bd04b8c1cf59cbaf699cd46
+size 11848
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_46_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_46_en.png
new file mode 100644
index 0000000000..04c6f7d8d3
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_46_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bbbe8903182497155e87eff344956f2fdb348acdb78c8be6fad8f0e1718ff516
+size 17219
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_47_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_47_en.png
new file mode 100644
index 0000000000..af409e4b90
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_47_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8414dc0f6de01cddc3971dad05778461c6e8220eb2c90016d3b5ef7902c6f7d
+size 14846
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_48_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_48_en.png
new file mode 100644
index 0000000000..078ce02360
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_48_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:20be0dd6e56278f168138622fdbf38d15e7161431812d0c2c4c9b3564bf81b7e
+size 12991
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_49_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_49_en.png
new file mode 100644
index 0000000000..cd60ad3148
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_49_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d2dd354988f252db4877f598614ffe50b2e5f5e33c0d6c1420b07b1ecf877a8
+size 13473
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_4_en.png
index d25a021051..64cb4cf640 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd10586365453b4353b430623a96e61caa8f1648a00b5f17bdc213a9604892c4
-size 20921
+oid sha256:d0c5e7e9fc0aa24c6d17b6273d4f37175c1140ceaab70ff29b0a692175bfaa7f
+size 20924
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_50_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_50_en.png
new file mode 100644
index 0000000000..473fd3f275
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_50_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:26071a6b16f4446526f6abf28274580eb0f385bd0e74f4f2b0479da5f5d4f6f2
+size 12914
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_6_en.png
index cd0a15bcd9..c317fecfac 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee56db9dbd7090e11245a0653bd91c6cf10f9bf4c5c07525f32560c2e3af17d8
+oid sha256:08c960c0596528eba8fb83ba7f71fa53c95b90d0f00f6068f85c826d0e24382c
 size 13132
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_7_en.png
index a657a31e50..1bb7a7b5b1 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d084ee537b20c9139a8213b3fa04384718da12be2759b2b6f19dd8016748a7f8
-size 15419
+oid sha256:6c6ade4b765289b471fc2689ebb7da8ab738cd8fa3168e36cd08342ee425c8ac
+size 15411
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_8_en.png
index bb3f227793..d538a631a4 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0aea61f4d5e013c83c244e10dad718cc12ffd15ed5ada336a9ea709cff5840e4
-size 13599
+oid sha256:61e3e8eeacadaa281328a538499f89c89946bd3e11ff5f576cbaf568f2f723a3
+size 13589
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_9_en.png
index 63526122e0..988f36e62e 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:970c808914b817fd6becac41d758e6313f9700b9440d4ef7ef81186e023c93ec
-size 13852
+oid sha256:0a3c3c152aeff7984717e0dd542604e119e592d198e24c9903f6a1cb4ce1f964
+size 13646
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_10_en.png
index 8acab35fb0..f788809889 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8c89084badb91481d83e94caceca7049bd724f8ba33f2890d63bb1a8401d77b
-size 14840
+oid sha256:3667009d409e5a8dd57e3d52c483f454f76a04ee2b4fe60def2a8e3f14249516
+size 13918
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_11_en.png
index d33fbddd58..3cda9fe8ae 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0235e9f8b3e5eab5d9e382b11130a62ebe554cb8991f1d79a4c48947c21d639b
-size 16814
+oid sha256:91c6ae370458d59210b64d222c607099346b5a6b1eb9d0793e5e775dc34b9916
+size 13747
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_12_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_12_en.png
index 957208b555..4ddb3472de 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dec0d0da741ad4153af86ba1a8289f421a9392f4ccb6a134ee6b1dcb6d6be3db
-size 15122
+oid sha256:89cd08a79e9b979b68e74b763e0deb766d374a1e04c72650e52cb05b32a3a93a
+size 14832
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_13_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_13_en.png
index 7dc7775d95..f3f269c765 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26239d9021572c9ac184675b5c6d8683749d57ef44f33078938550f9d7072c09
-size 10325
+oid sha256:0d83c718c35954b5eaced71e428e03ddbb86e0ed6297f71221705b18740e4ab8
+size 16815
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_14_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_14_en.png
index 712d4d453c..e2f1446fea 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d5a40aee82efbe857da7a121f0334168a230762c25b4f9ba62cb84a1b20dd90
-size 11398
+oid sha256:495051c67d72104f2624ea73f12f9a86571e2e1acd61f1a49a01b253aa9d33b1
+size 15124
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_15_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_15_en.png
index 0d2f59b472..cd0475825f 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03d0ded21f64013bedb73be7570087255ad4ce7dc256691947c0a4131afcfe4a
-size 12688
+oid sha256:0d62fb18995b549a238e77cc70d46e22c8edf32e4d658673e259647e1bef997c
+size 15184
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_16_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_16_en.png
index 4dbc05878f..a03d1da7fb 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c3b74815169cec4c5d1550f96b0a685b03506525ff4587095a3c9b7893cfcbf
-size 10988
+oid sha256:0d3da68927fc86e5d71ebd0adb2f3cf49eaf94f5418019a72339208f4495bff1
+size 15720
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_17_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_17_en.png
index 135e645ddd..7dc7775d95 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_17_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_17_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88d9e55e6cab4697780fde38ac51a7f20cc3d3c173a4af8761e260a02253cbaf
-size 12650
+oid sha256:26239d9021572c9ac184675b5c6d8683749d57ef44f33078938550f9d7072c09
+size 10325
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_18_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_18_en.png
index df67864a44..fec3afc632 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_18_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_18_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3356143e9b6a4e142c97e673f9e530fc4944e96fd2b3e1dc33a391aa95f2abe1
-size 13773
+oid sha256:85dd620057e64147e1ac409e9a3023efc795e06426cfd5deb94b14f08f528980
+size 11397
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_19_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_19_en.png
index 0db6cd5f06..19c583e781 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_19_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_19_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5ff5b619aea5f071c4ed2b23a005fbc14c65cc5042da9d93a8b56af94c4ac4f
-size 15903
+oid sha256:661c824676939245b6666f1af006f61c855e9baab13cdfe942b72eac5238a962
+size 12682
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_20_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_20_en.png
index 62cf2ce554..3457379745 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_20_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_20_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f630c17f3397054a2796ba80327b341edec5442f1d51f73c57104a328aa26a6
-size 14034
+oid sha256:94ddbe773a40bd985b327f8b01cb33ea172c865dad303015630220cf09f77880
+size 10981
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_21_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_21_en.png
index 23e9185b0c..1a1a9ffb7f 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_21_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_21_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e6cc774f4b4f35cc47319b983118b76ab75361f98112fe1fe18c87ee7e1e6d4
-size 14460
+oid sha256:c3ff569950f899d8bcc9229211cbbafd237404db3cf160d4e0f8cd555c97a740
+size 11293
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_22_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_22_en.png
index 67340637a9..1a1a9ffb7f 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_22_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_22_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d20e5ee28d2e00686c5490402b878748a07f02eb0ec62a3f1de0b4c205eb7b1
-size 15571
+oid sha256:c3ff569950f899d8bcc9229211cbbafd237404db3cf160d4e0f8cd555c97a740
+size 11293
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_23_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_23_en.png
index d3875536c7..135e645ddd 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_23_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_23_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7269157bdee33761c05e94497a43f194387dfd0c4c041201a700b51dec90b0df
-size 17698
+oid sha256:88d9e55e6cab4697780fde38ac51a7f20cc3d3c173a4af8761e260a02253cbaf
+size 12650
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_24_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_24_en.png
index 85515dab4d..d3c12d4fa3 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_24_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_24_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8034899aa95ccd789a4315809719bfcb67914ea931a18d0ea788c4858fb16e97
-size 15837
+oid sha256:1bcde2f97cd976d138caf3fb265a57e4fcdf0f27d1bcd9fed196bdcaded31a2c
+size 13776
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_25_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_25_en.png
index d00ac32e3c..4862702754 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_25_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_25_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3aff10fe78c73358c672341ef183830950162cdacb9838adb3c7b0f45ede34b5
-size 11047
+oid sha256:718458db1fb9ce0895a626abba0f274e2aee8426a99483b3e8eb6dbc7445aa7a
+size 15904
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_26_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_26_en.png
index 9b29057a46..60b98dea18 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_26_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_26_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:708a3135086a08ef5c7b20bbaa95f18d687abdfe5a80748f06c8691625d9930f
-size 12133
+oid sha256:2b577fff3aed9822067f5067c7b222cc7ecbe6f5bcf3b0e17c87aa253b985bec
+size 14030
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_27_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_27_en.png
index 7db77c3fff..0281dcdd9c 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_27_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_27_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31b308470d3fccf45d59fc8e4bef05286470b98916e458e16966fd46182e88b2
-size 13554
+oid sha256:14460f19a44b5674ee55c4f9f5abcab76e5c816f321f93bb7e5cfe946706d2ec
+size 14086
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_28_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_28_en.png
index e78b47c6ce..ff4ab49f89 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_28_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_28_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:352ce5517d371a6ccacceac4c93698b91eb7f94ba4bd46a1f3bb0f8cdc698ca0
-size 11703
+oid sha256:4a7ccaf461ec73526a1fc1ac0e7e6a1fd7067c49cafc8b465a086a93b951c68f
+size 14613
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_29_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_29_en.png
index 5abab16cd3..23e9185b0c 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_29_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_29_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:599bfa351c894812582239be7d5c945b5eb7e4c432bc59e276a9f133fac6e530
-size 20234
+oid sha256:9e6cc774f4b4f35cc47319b983118b76ab75361f98112fe1fe18c87ee7e1e6d4
+size 14460
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_30_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_30_en.png
index c4f8ad25cf..8ae8ddd318 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_30_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_30_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8632f1a875c675158c2ac617e319020230f2f796cf5df20a480f2f1027d90e19
-size 15341
+oid sha256:6adc4890b406cee4c678e5eb62603be7f038f8a8efd8eea8f11413715cea7da6
+size 15565
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_31_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_31_en.png
index e6dd276416..9e8aa36f5b 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_31_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_31_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:829f697cfa0f409bc836e07d25dc713e54091e4a3861ac3741e8ec2f8e2ff311
-size 21121
+oid sha256:a8c43e6c0bc920d74cae04d1911c82bcf9a8793e0976cd8659cd4e9f06374c8b
+size 17698
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_32_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_32_en.png
index 4ca6fa81c7..c4a2ccaebf 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_32_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_32_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29e0a6c7b5e5fbe6c240fca3f822e8ebf15ad10c4de02eb5fc78dc2f3eb2e3d5
-size 20743
+oid sha256:30b3911802698b203241dbfef35fd107d6e781713c5cd413090247cf27e9b97e
+size 15837
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_33_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_33_en.png
index 025d903212..63714660a2 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_33_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_33_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35ec154bb4a105ad33f78898c6c72d7b8be670d7188a5e7498f743fcd2273452
-size 11856
+oid sha256:82193b43a6d29c19f5b5928dc44dcc9016922ad98630c1707edd3d11f7ea9935
+size 15872
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_34_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_34_en.png
index 2acaa85e7b..35916ecf4d 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_34_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_34_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90e186637324c021e2815a3750c8e84f2d0a53cefb19256154f485e8ebbdf45c
-size 17124
+oid sha256:f00c788f206afc0757723e15d2cfa454943329801bc0eb6e3e682a8da230b413
+size 16410
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_35_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_35_en.png
index bf4090e112..d00ac32e3c 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_35_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_35_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94783aac31bd2993c26ce86ecc17e5d4ec37ebe8364b3f37fd96b1c571c4d2a6
-size 14052
+oid sha256:3aff10fe78c73358c672341ef183830950162cdacb9838adb3c7b0f45ede34b5
+size 11047
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_36_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_36_en.png
index 9d7ee6696a..f278e0a0b6 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_36_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_36_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11e826f01b6b6b5b2fca6a33abb8dbdebd2658baab5dcf5d6b9b7439ee0c1f9c
-size 12920
+oid sha256:986cd737a9fd4e9e7f41541c5df3f4800738a5febe6d5d0603c634fa3580ac20
+size 12128
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_37_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_37_en.png
index 210e8d26cb..f3232c3fe8 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_37_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_37_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb77faa7d7fef837af991a8de23684b9ed53defa1035513b8973db36a843ad58
-size 13387
+oid sha256:a8d7be0a60c676901589ea43e74c03ef221499989b07c55c472c03c75aef2096
+size 13544
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_38_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_38_en.png
index 14c08f0b62..762116566f 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_38_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_38_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ddef7c50d6a791c6a32bae8506a999b198bc601b70b6ffb5e5e7a8d5a2f1543
-size 12869
+oid sha256:62659c02ed16edada557c0c13693bbeb5eda5b42a5819f37535195f229a8b4a8
+size 11701
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_39_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_39_en.png
new file mode 100644
index 0000000000..c0f1f1d1fd
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_39_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3df8aa7b84c2676a84f473d09cd29667403afbb1adf31722c67d816fcf2baa16
+size 11968
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_40_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_40_en.png
new file mode 100644
index 0000000000..c0f1f1d1fd
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_40_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3df8aa7b84c2676a84f473d09cd29667403afbb1adf31722c67d816fcf2baa16
+size 11968
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_41_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_41_en.png
new file mode 100644
index 0000000000..d2dd4936ba
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_41_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0265b4de17d78805f0ae9b3f4075aee56e4d53483b04f28fc3f66c44d31650c7
+size 19897
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_42_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_42_en.png
new file mode 100644
index 0000000000..c4f8ad25cf
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_42_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8632f1a875c675158c2ac617e319020230f2f796cf5df20a480f2f1027d90e19
+size 15341
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_43_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_43_en.png
new file mode 100644
index 0000000000..7e86d1de71
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_43_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:563c72eb9611714afaf8b126b7735691d34c62a01b89b1045a3b59f996d4be1e
+size 20787
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_44_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_44_en.png
new file mode 100644
index 0000000000..734b5edf9e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_44_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b7a3de3ac091a2a07607074d610ad9bd37a052701d6f64b81e875fb4818ff19
+size 20414
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_45_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_45_en.png
new file mode 100644
index 0000000000..025d903212
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_45_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35ec154bb4a105ad33f78898c6c72d7b8be670d7188a5e7498f743fcd2273452
+size 11856
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_46_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_46_en.png
new file mode 100644
index 0000000000..2acaa85e7b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_46_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90e186637324c021e2815a3750c8e84f2d0a53cefb19256154f485e8ebbdf45c
+size 17124
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_47_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_47_en.png
new file mode 100644
index 0000000000..bf4090e112
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_47_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94783aac31bd2993c26ce86ecc17e5d4ec37ebe8364b3f37fd96b1c571c4d2a6
+size 14052
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_48_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_48_en.png
new file mode 100644
index 0000000000..9d7ee6696a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_48_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:11e826f01b6b6b5b2fca6a33abb8dbdebd2658baab5dcf5d6b9b7439ee0c1f9c
+size 12920
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_49_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_49_en.png
new file mode 100644
index 0000000000..210e8d26cb
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_49_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb77faa7d7fef837af991a8de23684b9ed53defa1035513b8973db36a843ad58
+size 13387
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_4_en.png
index d173392035..9bf8e46207 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:714864a3455e6797f4eb9be66dcd99bfb931fea2c8c3a7610e2962b181309686
-size 20533
+oid sha256:375fcdb12c76213423fe50656b30127659d6dd4c80d5aa842d198c38e3ad8486
+size 20521
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_50_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_50_en.png
new file mode 100644
index 0000000000..14c08f0b62
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_50_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ddef7c50d6a791c6a32bae8506a999b198bc601b70b6ffb5e5e7a8d5a2f1543
+size 12869
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_6_en.png
index 0d46f8056c..0d101f0a13 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ccb4c62dc282307727575827e22f69d083e7f3f9e201320f4dc7e95b73a3c3a
-size 13040
+oid sha256:61ffd011086b5c45cd4928e9737264c94897de25868e6f5be236af93c2d3d7ad
+size 13035
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_7_en.png
index bc498107f9..1639b9f704 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:744c0f0b121c0df805ab5c5d3a6de6a6ce866d57cd78fcd1a00b8e53bc4b2385
-size 15026
+oid sha256:f0f9ee8023fe05706663f1f336acd07c711ed32abb83b7bbf8a7ccbe1330b98a
+size 15031
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_8_en.png
index 0b508e0b86..1ce328cb25 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fce9852b7d9fb17ef003d1ed31b29d9c9dc6c0dc20dc8084613c4979cc725dc
+oid sha256:c664437d85aa8678ca10273e599e38ae16e52e4ccfcc4fb7285eb5cbb8344d5a
 size 13313
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_9_en.png
index 3cda9fe8ae..b139c2dece 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.components_RoomSummaryRow_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:91c6ae370458d59210b64d222c607099346b5a6b1eb9d0793e5e775dc34b9916
-size 13747
+oid sha256:2b8868624e1a0c91e1f3c1677c14567f72a50374d8d6a3923b2d513c07cc01c8
+size 13378
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Day_1_en.png
index fd17d9f320..a270674e69 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:471ac85d6c18b5186058067b4ce23b1c6cdc44c31e0f35907c65f8580b7c57ed
-size 43808
+oid sha256:447fe29130c68e1506f9a49e26229f419306a89c003040d099681ba8cc27e89e
+size 43475
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Night_1_en.png
index 69443c148a..8fa3637330 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.search_RoomListSearchContent_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f2971c76d9dc2a32b94f90d513eff37f3cb85272047be5358bc3e2c8092025a
-size 43413
+oid sha256:35fe66a9ef2bf4657abbe75625abc36c4d1473db39dd487046338281edef9ae0
+size 43068
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_0_en.png
index fb9ed3f101..d5f3ddc7bf 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43b2800a5fb8014557801f35210a98752529c3c71ec285e95be1d405d2910327
-size 84602
+oid sha256:6c34e6ad761112ab3ad36de81eaa23e84667f9259ce2718c9db1b22f60f866b6
+size 84244
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_0_en.png
index f1a441a0b3..0e68328732 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:330103af450379bc1ea3bd9815779324384d6025a68ba8e3bb9a76b2565fa2dc
-size 82909
+oid sha256:23fbf0567b03332593a7cede27b247d3da8ba9ff16d066f5372e0f597f264026
+size 82587
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeViewA11y_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeViewA11y_en.png
index 560b337d7d..cfde8f7313 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeViewA11y_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeViewA11y_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a77b3fd89bdf26f15b44d070ee60af56a885e5c8d087780630e1dc5303de077c
-size 143941
+oid sha256:4743a05888b1109bb4a87bb3f26e526d1d0fa41528d4a9776dbb715761481bd3
+size 143568
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_0_en.png
index 5b1808def1..6c280379d3 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:905febd17389965c962b51c0225a3019d0b5b49ed1189e15e8be631989effb85
-size 68367
+oid sha256:6522e7b2a874145b2bc3e105e1d75115324110b42eca8f19b4f5c8fffdbdf9f3
+size 67986
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_10_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_10_en.png
index e2b3622d86..702f675b64 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c3e85ad3d267db2fa0964b4d28ef9fd50ce4989259646d5d07bdea7e24c7a4c
-size 36872
+oid sha256:21371e86345894c9c940cacbecaa00ad7bfba3385ecc2fac4d5950e94e30c04a
+size 36843
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_11_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_11_en.png
index 48b80d3c0c..e18220ad3c 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c3580427877cca8f59538bccd47ee19f57b4bdce28d60135da7de185e17f8f1
-size 32636
+oid sha256:a0138600e742cd3981037948974787e3e137def232d12dd47885d228d089abc9
+size 32626
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_13_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_13_en.png
index a6942d9c35..a88fa07eb1 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d07d37556793e63eb09f0ea7e71a2a8bca73098d7372dea35b1ad916a8ebebe
-size 95328
+oid sha256:e14b4474acb3e3d663b6df1beffc67b053b75fd2b34bfb09e6bbf634f2ed15ab
+size 94965
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_14_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_14_en.png
index 4cf6e8dd31..5e751f99d3 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:545e5dc4c7602e6535109e34816922a76d58c0ae19e7d86627b9515c1c4645c3
-size 87943
+oid sha256:e479935da0c1e403f80451ff5ed7403c341f6b5d840c5bf3861de9ade9251777
+size 87548
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_15_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_15_en.png
index 0f310c78a8..1e36871727 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f2280adb5d99a20fbe98b8d097e97c2de0c05a083382a905075bfb5795a2290
-size 55890
+oid sha256:179cdc42442d764de150ee7738e78e580c942b379cdd5079903d33d5f5318b12
+size 55863
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_16_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_16_en.png
index 17ff86bf54..1cfbe24537 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e2d1b5923dd2941bd7e60a9019a7770ed3383529ad9a8f3572c9e3d450310e0
-size 37461
+oid sha256:2249d4b82b98d0770410d066d3b918b6faecdcf15453f7cbd69d093c16a1cc61
+size 37408
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_1_en.png
index 5b1808def1..6c280379d3 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:905febd17389965c962b51c0225a3019d0b5b49ed1189e15e8be631989effb85
-size 68367
+oid sha256:6522e7b2a874145b2bc3e105e1d75115324110b42eca8f19b4f5c8fffdbdf9f3
+size 67986
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_2_en.png
index 5b1808def1..6c280379d3 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:905febd17389965c962b51c0225a3019d0b5b49ed1189e15e8be631989effb85
-size 68367
+oid sha256:6522e7b2a874145b2bc3e105e1d75115324110b42eca8f19b4f5c8fffdbdf9f3
+size 67986
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_3_en.png
index cfd1827f50..2e85657a95 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6618a3f641c4919fd009f8bab432cd0d03ee933accf5b33815202eed721c78bf
-size 65320
+oid sha256:0672d02683ac8fa43f85d089f944993c546e913c6b4b8057bf414a248110ad85
+size 65297
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_4_en.png
index 9eb0a6a43d..ef2ab7b8d1 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0227ce3fa0664ff4a99649532683837835733d1bb26dcd05b7f6277964b5115c
-size 54342
+oid sha256:756ca818c4f0edc848dd963526ac6d533bd3fa3062c95555c20b0af115ea55f4
+size 54283
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_5_en.png
index 5b1808def1..6c280379d3 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:905febd17389965c962b51c0225a3019d0b5b49ed1189e15e8be631989effb85
-size 68367
+oid sha256:6522e7b2a874145b2bc3e105e1d75115324110b42eca8f19b4f5c8fffdbdf9f3
+size 67986
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_6_en.png
index 516089368e..12c5485223 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fd658e684c89fc1b201a4a4090037d83c8882774b2a2593b12b30bd011971ecf
-size 55324
+oid sha256:29617f74f80d296d24b8bcd66d8837f3b9b5c4a278c8baca5d7af9c204953f34
+size 54990
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_7_en.png
index f4bb27c8b4..23bfc078ec 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c5798c49f07cd4a564c6b48c18dc0a67b5437e403da63e154c6bdbcee9fb060
-size 55128
+oid sha256:3afe56e1e5b582c8acd4f7b33bc725c7930cc3d4f3863cc0ee386cc7e5677968
+size 54795
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_8_en.png
index b43498911a..aae78d67af 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c8042cfa5d850e0322da8a6cb1fb019da4d3675c469d29aec84fe9d6a8aa147
-size 53368
+oid sha256:366cec0595cb8a30d677287598de8326850e4bde28ffc8b398bdbdc83fe6b1a5
+size 53028
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_9_en.png
index c25fce6fdf..10f74710ba 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4441594ce0a35e4df5cc0a1d7dff028fd6842e229e0ec10a1dca05a84749010c
-size 87798
+oid sha256:c517e3c1595945e27e5b76f7fac96cf744bb1bcf263adef50f8f1ae8e2da4eae
+size 87417
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_0_en.png
index af72b7ef67..71cc7f0311 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e9677b8e987ca3d709a60fe92ec0125ef559ea765daeff4f58ea335796731aa
-size 62919
+oid sha256:2ac8b408f8c524cf07eb5572b1014d8759a6424d7f457f4e566afa7d412f2c49
+size 62640
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_10_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_10_en.png
index fc6b74a2f6..3682ec4637 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:588859e742ca76818510abb9326969da5c227d0946ea6aac9de216e1a62a7d6a
-size 31657
+oid sha256:05d3024cbc8a4a32618c5fc1d359f1152a03d3e304803a86d6780b5529159b3d
+size 31647
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_11_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_11_en.png
index 6f2a17627d..3c7aaacfcc 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:827036f5c685629037b5bb7ae3265b3261a52ab3d8b912344cd06137839512be
-size 27266
+oid sha256:e53c44f711122bdacc3d8044c8061fad3e6dbb3a75f37b7812e4f50ccc05095f
+size 27250
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_13_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_13_en.png
index 2c40439113..18fdca6b14 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d760c522a5e69fb609740180b4c90a8046f0a516fc2271b14ac6b337a0bba3b4
-size 88924
+oid sha256:eebe003dbf4c8ee0bedfdd2428dbfbfb75756da2d5dc42fafeacb03a63b9be77
+size 88607
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_14_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_14_en.png
index 7eaf2627d0..2e1fa6593f 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_14_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_14_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c19fc8a6cfb56d95433cc6e5cc193f11c6b6b3c57d6b2f49b0e21f226ef8a2fe
-size 81593
+oid sha256:fda62f52097c6972b746babeb8bbfa7152fe11865c664f76c6bef3b1fa6a2d76
+size 81273
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_15_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_15_en.png
index 2e8b7314f6..24b402b7ec 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:422c10006716ea99ae5d3222334f4fe74a002e42fa2ab8b7890dff31a60ca8f7
-size 50444
+oid sha256:e7015bbe32c70d7a94de85a80495e16aa807b49074e0ae75331c051296997fb0
+size 50432
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_16_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_16_en.png
index a26f43f289..8b2e84c525 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:858ed6993ba8d322e9acc40ca3e759372e19cd3aae9854709f374c0c8d1c4429
-size 32549
+oid sha256:d48383d688df552d456c32fd3ae2c0abc883957740b46125c509a7e027b4125f
+size 32514
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_1_en.png
index af72b7ef67..71cc7f0311 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e9677b8e987ca3d709a60fe92ec0125ef559ea765daeff4f58ea335796731aa
-size 62919
+oid sha256:2ac8b408f8c524cf07eb5572b1014d8759a6424d7f457f4e566afa7d412f2c49
+size 62640
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_2_en.png
index af72b7ef67..71cc7f0311 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e9677b8e987ca3d709a60fe92ec0125ef559ea765daeff4f58ea335796731aa
-size 62919
+oid sha256:2ac8b408f8c524cf07eb5572b1014d8759a6424d7f457f4e566afa7d412f2c49
+size 62640
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_3_en.png
index a1d6128daa..3b920ab162 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89e25edf690c8c416699e82781a4dd01f4ab370e8ca868b7bd4ce1a0e5a1124e
-size 60532
+oid sha256:4076933fb4724fc51000b75b1fcbef45cab3fac1cbd54b8a10324365a4363abd
+size 60520
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_4_en.png
index 95f3da33c4..5011db41f4 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a04f8865034c36f32f0f7dd098fd6bf3e80f96869036f965c755a7a48286a071
-size 49232
+oid sha256:f827f6313bc5958daebc719797bdd8b50796b0e766ac931cf90f4ad31c979a08
+size 49192
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_5_en.png
index af72b7ef67..71cc7f0311 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e9677b8e987ca3d709a60fe92ec0125ef559ea765daeff4f58ea335796731aa
-size 62919
+oid sha256:2ac8b408f8c524cf07eb5572b1014d8759a6424d7f457f4e566afa7d412f2c49
+size 62640
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_6_en.png
index 14dc407833..5f85c83794 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:784de072b6803569aaba3fddfeb1301ace32f51d2a3b78d823ccaaa77fd5d52e
-size 52222
+oid sha256:f66d640d03876ab52239f1946c60abca4fb41badbdf85b9f52f74ce016a760fa
+size 51898
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_7_en.png
index d4f6602825..df6ce558ab 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fdec8293d351e9b879bafdff048a9ae3bdeaf34d1e47125fe94386415ef80ac4
-size 51941
+oid sha256:16c3d5fb4eaa27c15bf22865ad97807a7e5b9cbc73194b67d3c8578c73b91de2
+size 51636
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_8_en.png
index 2dcffff9f8..966fdbf88e 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0599ae5bfbd84c1087b06b1e50352fd21b0d784e62536868f012f8a3ab8da95
-size 50257
+oid sha256:79893b80ce51fc98742c9c0e31605f691953add4c6e9f55d0c3957cc8a723dc2
+size 49909
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_9_en.png
index 042afef2d1..a33dcb8f4e 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl_HomeView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3af77b779731125d04585399023ac996fbdd4c42ee634d3c090153972a458212
-size 81441
+oid sha256:be43a15e95d9d073c95de0b876613bc4fb9c3f815ee32486cbbeeb8edbe8a553
+size 81131
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerBothIndicators_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerBothIndicators_Day_0_en.png
index 4a73754a8e..6a851f755e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerBothIndicators_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerBothIndicators_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ff35c533fef9ca6ddd0e0f31ae4f4d5673e7e90f6d52d9636bfa62a045d8ebf
-size 47952
+oid sha256:b55275e3538a08895a7eefe15e35afef1ce83975f6fb37c541d9f800d9f2d2a6
+size 47213
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerBothIndicators_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerBothIndicators_Night_0_en.png
index 6df8acbfd3..7eaee8802c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerBothIndicators_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerBothIndicators_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cbcfc8e7f8fa55d007014f39be61a2d8a5a895ecb51f06d83b4f65c13302ebdd
-size 51087
+oid sha256:934acae5403f1523092331d067b797585265026f03081c2875180e961f0957cf
+size 50413
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerJumpToUnreadIndicatorOnly_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerJumpToUnreadIndicatorOnly_Day_0_en.png
index e5528b303c..6a851f755e 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerJumpToUnreadIndicatorOnly_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerJumpToUnreadIndicatorOnly_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:990da337f293792e43768e9aa507581df18fac8b2b9dd01d7ad980e4239bec53
-size 47571
+oid sha256:b55275e3538a08895a7eefe15e35afef1ce83975f6fb37c541d9f800d9f2d2a6
+size 47213
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerJumpToUnreadIndicatorOnly_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerJumpToUnreadIndicatorOnly_Night_0_en.png
index d6b7840b7b..7eaee8802c 100644
--- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerJumpToUnreadIndicatorOnly_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline_TimelineViewWithReadMarkerJumpToUnreadIndicatorOnly_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:092e8d3ae1d219d48e3f696244cc83a53aa6402096ec6b7d817d3a115c6a28ac
-size 50750
+oid sha256:934acae5403f1523092331d067b797585265026f03081c2875180e961f0957cf
+size 50413
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_15_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_15_en.png
index 20b8a5e619..87531bbb94 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ab43948e7b58860945365c7a7d8bbf61f1edf7d6463296d57b94591b3c829a4
-size 40389
+oid sha256:5ae035447be0df2583e4934e2f9b56812d11affa24535adf38f9e8ca2d71ca21
+size 40340
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_15_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_15_en.png
index 12eb9af146..9a8ec4e896 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_15_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_15_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e97d75c02a333e0ba2b66abb364bdbf70db08ed92614d10c7f0c9ad38b20600
-size 41668
+oid sha256:c7379ec1ccc4eb1ca8647d4c1ff139af7d337104b02691a89de3e5582b3e3f37
+size 41604
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_3_en.png
index 8b83d0555c..4cd66fda9f 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:373cfbe1fbd3d9e06bc2079b7ceadccce999efd0cbb1d43f7e791450f3882cad
-size 59876
+oid sha256:41aec793fd2618601a96c199cb668a2225f0ba6d76a7926e788247660c43accd
+size 59560
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_4_en.png
index 6febc55310..6b67239002 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5192794371b4b3d10d5e8035f5ccf5dad66b04f16abb686cb5820d4647f678ef
-size 60550
+oid sha256:b7ad98eb663979992303b0b07af55f5a602538f8a3568797b5f876fc9673a843
+size 60234
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_3_en.png
index 8d9d32385a..86d270af61 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ee744055473f7b652d874ff024ece68434e88ef085571dbab6466bcd3557c23
-size 58226
+oid sha256:56ef681d933d0e0647f3002a847aaa299f3d36db71d6d03cc63e73e9d5f33d64
+size 57916
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_4_en.png
index 2c24a43118..33bd00cbc2 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3c991f23daeb792f580afc18f3f528649cc92f27555ed05cc1abedad8accc27
-size 58781
+oid sha256:5dc6cd1814d57156e9644990d634c9e6f995b1e35150acf84256a84049c6005a
+size 58480
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_CounterAtom_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_CounterAtom_Day_0_en.png
index b707ae4e42..a4b5cc493f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_CounterAtom_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_CounterAtom_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea3b6e3821ae1a9bc142d831c1359b030f8ca555b2bcf0824723db0603776631
-size 8903
+oid sha256:4183ed1526f154b7044cff9b02a1e34c9c0a5fdf93232c9a5a1dc980fe0f1388
+size 7935
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_CounterAtom_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_CounterAtom_Night_0_en.png
index ad60d0287e..860f6cef22 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_CounterAtom_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_CounterAtom_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bb14c46d84c653a0429012b41e7acfa5205b3d6d464bea98612cbdb3eca5f27
-size 8276
+oid sha256:fa39f384f766a79316d8f930ba682b5b08876533e067bbd350b3261d36297888
+size 7424
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_UnreadIndicatorAtom_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_UnreadIndicatorAtom_Day_0_en.png
index 4f41fb6a88..a17548b7f6 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_UnreadIndicatorAtom_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_UnreadIndicatorAtom_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2d4fa0d01fecbd961c781159af8249a400e4be7fa7383dab75f95fb9241608e
-size 4086
+oid sha256:a8cbffff27d8e2284a91afcab63419ad77b4b72e2583d5f5f5fe9f3b86c4497a
+size 7267
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_UnreadIndicatorAtom_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_UnreadIndicatorAtom_Night_0_en.png
index 0e0bcdbb72..d380a94d3e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_UnreadIndicatorAtom_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.atoms_UnreadIndicatorAtom_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a73349d1bbd4afedaf49ca91d4037a659b17fa6e4605a3e9384ffa556a063f25
-size 4035
+oid sha256:ed6a76df3601c8740d636503aea1173ed711da91fae12935ddd925483b4197ca
+size 6642
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png
index 58546b8522..a57f355bf0 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30357bf18792db5ab20085010251170a724ffe8c00313facd04ee704e806af64
-size 10982
+oid sha256:5c21e2c2e0804f1f8f3e7700a7e4d33875ffc003d6160da208b2a37fae25f0ff
+size 10705
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en.png
index fedead0fa8..3f37df18dc 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbarNoFab_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4811667dec0f32accc5e2c8a5dd5c0b34017fcff8d1e0376ee7a4708426bca0f
-size 9838
+oid sha256:8e649819986d9158c6c35132705c1b2e71e8a64acbceb71cc7aececcd9c44e83
+size 9631
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en.png
index 83302d6ba4..b23be9a388 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16dee1dfe746cd40dac9fe8f0af3ecb42cd14bab5cc490917b589beed065ed1b
-size 14686
+oid sha256:f56bf1ef52dd50ba4124e22b1069854f8ff9a98909606c3ecd3196f0a0733d9e
+size 33713
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png
index 4da2a98aca..ad9b192292 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_HorizontalFloatingToolbar_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef0dc4d53daeb986f378b6e4d85928b4b6729336c89cf21e642c88c53688a3ab
-size 10292
+oid sha256:024db85a458a69802e72aec45de70492f0989148f36672a649240465a645c22b
+size 23714
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_NavigationBar_App_Bars_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_NavigationBar_App_Bars_en.png
index 34384b3ba4..be17322a4d 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_NavigationBar_App_Bars_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_NavigationBar_App_Bars_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:121b01a2411c4e12782b72a7bba1210c434b67c8281247b4bc080c8a8bb4e097
-size 15690
+oid sha256:3a45c52567b03fd01fc725e7466a853a65399d116b8840bdee1ab703603487fa
+size 15819
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en.png
index eb21a4e93b..d368a2980f 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e56d17fe464fbb261056dd0ac7b8c87efae96f7187f71bd6c9c5b3aeb7c358d6
-size 19424
+oid sha256:9569da9b4f797a32c432426c0713322dbe87d89c7c926e9f1df1d835c815960f
+size 19075
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en.png
index b3906c8856..c75b08e44b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb1f5c4a72adcdff1556a88190658fa05452952954502ad0fc9105b6dc802d04
-size 19114
+oid sha256:346455332fc343ce172eb523c426cd663db535512b8eabfa68d45ce312ca9306
+size 18756
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en.png
index 9886d9c865..f89102d3ea 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fd9a020a4b4a2d9fe1a720e1ef1ea6d444d568730ca10a27764a6a11ae93ca9e
-size 37428
+oid sha256:1bf98a8db438787d6cf5a3c22e617c0a0e3d6069880352bb2c2ee1e1d8fbacd9
+size 37121
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en.png
index 147081568d..7407952240 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5bd1e4629aad697d49657dcaee6dec1cae46980d9246f0a48d22cdfed6823ce4
-size 18692
+oid sha256:507882f8fbac05f38ab0a76e37bfe8de1e213f28870346d600adb1ca13487c9e
+size 18363
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en.png
index d8a36be2bc..b9aa819216 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4411decc4e53e10e4debd884aa5e1cc51f6fa057dfcbe9828e7cd87959411e0
-size 18397
+oid sha256:3523780d1f7526194ffd898ab0b817ae6158983308c4116f5f894964b7504042
+size 18057
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en.png
index eda3c1422a..388e9ba9b2 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65f65fba9f6fc97edceb825090112245e17b8f302382dc5053eb0fd4af2c5bc8
-size 36324
+oid sha256:8708e565a0811df16e20648a64938934ced44e598160c4a5230cbf03f3826c5d
+size 36056