diff --git a/changelog.d/238.feature b/changelog.d/238.feature
new file mode 100644
index 0000000000..f731937271
--- /dev/null
+++ b/changelog.d/238.feature
@@ -0,0 +1 @@
+[Create and join rooms] New invites are now marked with a badge
diff --git a/features/invitelist/api/src/main/kotlin/io/element/android/features/invitelist/api/SeenInvitesStore.kt b/features/invitelist/api/src/main/kotlin/io/element/android/features/invitelist/api/SeenInvitesStore.kt
new file mode 100644
index 0000000000..ac143b8740
--- /dev/null
+++ b/features/invitelist/api/src/main/kotlin/io/element/android/features/invitelist/api/SeenInvitesStore.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.invitelist.api
+
+import io.element.android.libraries.matrix.api.core.RoomId
+import kotlinx.coroutines.flow.Flow
+
+interface SeenInvitesStore {
+    fun seenRoomIds(): Flow<Set<RoomId>>
+    suspend fun markAsSeen(roomIds: Set<RoomId>)
+}
diff --git a/features/invitelist/impl/build.gradle.kts b/features/invitelist/impl/build.gradle.kts
index 09dec00789..e54b8ede3b 100644
--- a/features/invitelist/impl/build.gradle.kts
+++ b/features/invitelist/impl/build.gradle.kts
@@ -35,6 +35,7 @@ dependencies {
     implementation(projects.anvilannotations)
     anvil(projects.anvilcodegen)
     api(projects.features.invitelist.api)
+    implementation(libs.androidx.datastore.preferences)
     implementation(projects.libraries.core)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
@@ -48,6 +49,7 @@ dependencies {
     testImplementation(libs.test.truth)
     testImplementation(libs.test.turbine)
     testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.features.invitelist.test)
 
     ksp(libs.showkase.processor)
 }
diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/DefaultSeenInvitesStore.kt b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/DefaultSeenInvitesStore.kt
new file mode 100644
index 0000000000..848a4e2ba7
--- /dev/null
+++ b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/DefaultSeenInvitesStore.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.invitelist.impl
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringSetPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import com.squareup.anvil.annotations.ContributesBinding
+import io.element.android.features.invitelist.api.SeenInvitesStore
+import io.element.android.libraries.di.ApplicationContext
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.core.RoomId
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import javax.inject.Inject
+
+private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "elementx_seeninvites")
+private val seenInvitesKey = stringSetPreferencesKey("seenInvites")
+
+
+@ContributesBinding(SessionScope::class)
+class DefaultSeenInvitesStore @Inject constructor(
+    @ApplicationContext context: Context
+) : SeenInvitesStore {
+
+    private val store = context.dataStore
+
+    override fun seenRoomIds(): Flow<Set<RoomId>> =
+        store.data.map { prefs ->
+            prefs[seenInvitesKey]
+                .orEmpty()
+                .map { RoomId(it) }
+                .toSet()
+        }
+
+    override suspend fun markAsSeen(roomIds: Set<RoomId>) {
+        store.edit { prefs ->
+            prefs[seenInvitesKey] = roomIds.map { it.value }.toSet()
+        }
+    }
+
+}
diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt
index c01d85f55f..dc9302b908 100644
--- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt
+++ b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt
@@ -17,12 +17,15 @@
 package io.element.android.features.invitelist.impl
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import io.element.android.features.invitelist.api.SeenInvitesStore
 import io.element.android.features.invitelist.impl.model.InviteListInviteSummary
 import io.element.android.features.invitelist.impl.model.InviteSender
 import io.element.android.libraries.architecture.Async
@@ -34,11 +37,13 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomSummary
 import kotlinx.collections.immutable.toPersistentList
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class InviteListPresenter @Inject constructor(
     private val client: MatrixClient,
+    private val store: SeenInvitesStore,
 ) : Presenter<InviteListState> {
 
     @Composable
@@ -48,6 +53,21 @@ class InviteListPresenter @Inject constructor(
             .roomSummaries()
             .collectAsState()
 
+        var seenInvites by remember { mutableStateOf<Set<RoomId>>(emptySet()) }
+
+        LaunchedEffect(Unit) {
+            seenInvites = store.seenRoomIds().first()
+        }
+
+        LaunchedEffect(invites) {
+            store.markAsSeen(
+                invites
+                    .filterIsInstance<RoomSummary.Filled>()
+                    .map { it.details.roomId }
+                    .toSet()
+            )
+        }
+
         val localCoroutineScope = rememberCoroutineScope()
         val acceptedAction: MutableState<Async<RoomId>> = remember { mutableStateOf(Async.Uninitialized) }
         val declinedAction: MutableState<Async<Unit>> = remember { mutableStateOf(Async.Uninitialized) }
@@ -86,8 +106,17 @@ class InviteListPresenter @Inject constructor(
             }
         }
 
+        val inviteList = remember(seenInvites, invites) {
+            invites
+                .filterIsInstance<RoomSummary.Filled>()
+                .map {
+                    it.toInviteSummary(seenInvites.contains(it.details.roomId))
+                }
+                .toPersistentList()
+        }
+
         return InviteListState(
-            inviteList = invites.mapNotNull(::toInviteSummary).toPersistentList(),
+            inviteList = inviteList,
             declineConfirmationDialog = decliningInvite.value?.let {
                 InviteDeclineConfirmationDialog.Visible(
                     isDirect = it.isDirect,
@@ -113,49 +142,44 @@ class InviteListPresenter @Inject constructor(
         }.execute(declinedAction)
     }
 
-    private fun toInviteSummary(roomSummary: RoomSummary): InviteListInviteSummary? {
-        return when (roomSummary) {
-            is RoomSummary.Filled -> roomSummary.details.run {
-                val i = inviter
-                val avatarData = if (isDirect && i != null)
-                    AvatarData(
-                        id = i.userId.value,
-                        name = i.displayName,
-                        url = i.avatarUrl,
-                    )
-                else
-                    AvatarData(
-                        id = roomId.value,
-                        name = name,
-                        url = avatarURLString
-                    )
-
-                val alias = if (isDirect)
-                    inviter?.userId?.value
-                else
-                    canonicalAlias
-
-                InviteListInviteSummary(
-                    roomId = roomId,
-                    roomName = name,
-                    roomAlias = alias,
-                    roomAvatarData = avatarData,
-                    isDirect = isDirect,
-                    sender = if (isDirect) null else inviter?.let {
-                        InviteSender(
-                            userId = it.userId,
-                            displayName = it.displayName ?: "",
-                            avatarData = AvatarData(
-                                id = it.userId.value,
-                                name = it.displayName,
-                                url = it.avatarUrl,
-                            ),
-                        )
-                    },
+    private fun RoomSummary.Filled.toInviteSummary(seen: Boolean) = details.run {
+        val i = inviter
+        val avatarData = if (isDirect && i != null)
+            AvatarData(
+                id = i.userId.value,
+                name = i.displayName,
+                url = i.avatarUrl,
+            )
+        else
+            AvatarData(
+                id = roomId.value,
+                name = name,
+                url = avatarURLString
+            )
+
+        val alias = if (isDirect)
+            inviter?.userId?.value
+        else
+            canonicalAlias
+
+        InviteListInviteSummary(
+            roomId = roomId,
+            roomName = name,
+            roomAlias = alias,
+            roomAvatarData = avatarData,
+            isDirect = isDirect,
+            isNew = !seen,
+            sender = if (isDirect) null else inviter?.run {
+                InviteSender(
+                    userId = userId,
+                    displayName = displayName ?: "",
+                    avatarData = AvatarData(
+                        id = userId.value,
+                        name = displayName,
+                        url = avatarUrl,
+                    ),
                 )
-            }
-
-            else -> null
-        }
+            },
+        )
     }
 }
diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt
index b5d35ef58a..56b3f87934 100644
--- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt
+++ b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt
@@ -16,6 +16,7 @@
 
 package io.element.android.features.invitelist.impl.components
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.IntrinsicSize
@@ -27,13 +28,17 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.foundation.text.appendInlineContent
 import androidx.compose.material3.MaterialTheme
 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.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.Placeholder
@@ -59,6 +64,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.theme.components.Button
 import io.element.android.libraries.designsystem.theme.components.OutlinedButton
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.theme.roomListUnreadIndicator
 import kotlinx.collections.immutable.persistentMapOf
 import io.element.android.libraries.ui.strings.R as StringR
 
@@ -73,8 +79,8 @@ internal fun InviteSummaryRow(
 ) {
     Box(
         modifier = modifier
-            .fillMaxWidth()
-            .heightIn(min = minHeight)
+                .fillMaxWidth()
+                .heightIn(min = minHeight)
     ) {
         DefaultInviteSummaryRow(
             invite = invite,
@@ -92,19 +98,20 @@ internal fun DefaultInviteSummaryRow(
 ) {
     Row(
         modifier = Modifier
-            .fillMaxWidth()
-            .padding(horizontal = 16.dp, vertical = 12.dp)
-            .height(IntrinsicSize.Min),
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp, vertical = 12.dp)
+                .height(IntrinsicSize.Min),
         verticalAlignment = Alignment.Top
     ) {
         Avatar(
             invite.roomAvatarData,
         )
+
         Column(
             modifier = Modifier
-                .padding(start = 12.dp, end = 4.dp)
-                .alignByBaseline()
-                .weight(1f)
+                    .padding(start = 12.dp, end = 4.dp)
+                    .alignByBaseline()
+                    .weight(1f)
         ) {
             // Name
             Text(
@@ -152,6 +159,15 @@ internal fun DefaultInviteSummaryRow(
                 )
             }
         }
+
+        val unreadIndicatorColor = if (invite.isNew) MaterialTheme.roomListUnreadIndicator() else Color.Transparent
+
+        Box(
+            modifier = Modifier
+                    .size(12.dp)
+                    .clip(CircleShape)
+                    .background(unreadIndicatorColor)
+        )
     }
 }
 
@@ -183,7 +199,11 @@ private fun SenderRow(sender: InviteSender) {
                     Placeholder(20.dp.toSp(), 20.dp.toSp(), PlaceholderVerticalAlign.Center)
                 }
             ) {
-                Box(Modifier.fillMaxHeight().padding(end = 4.dp)) {
+                Box(
+                        Modifier
+                                .fillMaxHeight()
+                                .padding(end = 4.dp)
+                ) {
                     Avatar(
                         avatarData = sender.avatarData.copy(size = AvatarSize.Custom(16.dp)),
                         modifier = Modifier.align(Alignment.Center)
diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummary.kt b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummary.kt
index f065f28a3a..ed00867b94 100644
--- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummary.kt
+++ b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummary.kt
@@ -28,7 +28,8 @@ data class InviteListInviteSummary(
     val roomAlias: String? = null,
     val roomAvatarData: AvatarData = AvatarData(roomId.value, roomName),
     val sender: InviteSender? = null,
-    val isDirect: Boolean = false
+    val isDirect: Boolean = false,
+    val isNew: Boolean = false,
 )
 
 data class InviteSender(
diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummaryProvider.kt b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummaryProvider.kt
index 84babb6035..7196220788 100644
--- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummaryProvider.kt
+++ b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/model/InviteListInviteSummaryProvider.kt
@@ -26,6 +26,7 @@ open class InviteListInviteSummaryProvider : PreviewParameterProvider<InviteList
             aInviteListInviteSummary(),
             aInviteListInviteSummary().copy(roomAlias = "#someroom:example.com"),
             aInviteListInviteSummary().copy(roomName = "Alice", sender = null),
+            aInviteListInviteSummary().copy(isNew = true)
         )
 }
 
diff --git a/features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt b/features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt
index f5f0849991..b8a99b40cc 100644
--- a/features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt
+++ b/features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt
@@ -20,6 +20,7 @@ import app.cash.molecule.RecompositionClock
 import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth
+import io.element.android.features.invitelist.test.FakeSeenInvitesStore
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -29,6 +30,7 @@ import io.element.android.libraries.matrix.api.room.RoomSummary
 import io.element.android.libraries.matrix.api.room.RoomSummaryDetails
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_ROOM_ID_2
 import io.element.android.libraries.matrix.test.A_ROOM_NAME
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
@@ -50,7 +52,8 @@ class InviteListPresenterTests {
             FakeMatrixClient(
                 sessionId = A_SESSION_ID,
                 invitesDataSource = invitesDataSource,
-            )
+            ),
+            FakeSeenInvitesStore(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -58,21 +61,7 @@ class InviteListPresenterTests {
             val initialState = awaitItem()
             Truth.assertThat(initialState.inviteList).isEmpty()
 
-            invitesDataSource.postRoomSummary(
-                listOf(
-                    RoomSummary.Filled(
-                        RoomSummaryDetails(
-                            roomId = A_ROOM_ID,
-                            name = A_ROOM_NAME,
-                            avatarURLString = null,
-                            isDirect = false,
-                            lastMessage = null,
-                            lastMessageTimestamp = null,
-                            unreadNotificationCount = 0,
-                        )
-                    )
-                )
-            )
+            invitesDataSource.postRoomSummary(listOf(aRoomSummary()))
 
             val withInviteState = awaitItem()
             Truth.assertThat(withInviteState.inviteList.size).isEqualTo(1)
@@ -88,7 +77,8 @@ class InviteListPresenterTests {
             FakeMatrixClient(
                 sessionId = A_SESSION_ID,
                 invitesDataSource = invitesDataSource,
-            )
+            ),
+            FakeSeenInvitesStore(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -117,7 +107,8 @@ class InviteListPresenterTests {
             FakeMatrixClient(
                 sessionId = A_SESSION_ID,
                 invitesDataSource = invitesDataSource,
-            )
+            ),
+            FakeSeenInvitesStore(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -144,7 +135,8 @@ class InviteListPresenterTests {
             FakeMatrixClient(
                 sessionId = A_SESSION_ID,
                 invitesDataSource = invitesDataSource,
-            )
+            ),
+            FakeSeenInvitesStore(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -169,7 +161,8 @@ class InviteListPresenterTests {
             FakeMatrixClient(
                 sessionId = A_SESSION_ID,
                 invitesDataSource = invitesDataSource,
-            )
+            ),
+            FakeSeenInvitesStore(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -194,7 +187,8 @@ class InviteListPresenterTests {
             FakeMatrixClient(
                 sessionId = A_SESSION_ID,
                 invitesDataSource = invitesDataSource,
-            )
+            ),
+            FakeSeenInvitesStore(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -219,7 +213,7 @@ class InviteListPresenterTests {
             invitesDataSource = invitesDataSource,
         )
         val room = FakeMatrixRoom()
-        val presenter = InviteListPresenter(client)
+        val presenter = InviteListPresenter(client, FakeSeenInvitesStore())
         client.givenGetRoomResult(A_ROOM_ID, room)
 
         moleculeFlow(RecompositionClock.Immediate) {
@@ -246,7 +240,7 @@ class InviteListPresenterTests {
             invitesDataSource = invitesDataSource,
         )
         val room = FakeMatrixRoom()
-        val presenter = InviteListPresenter(client)
+        val presenter = InviteListPresenter(client, FakeSeenInvitesStore())
         val ex = Throwable("Ruh roh!")
         room.givenRejectInviteResult(Result.failure(ex))
         client.givenGetRoomResult(A_ROOM_ID, room)
@@ -278,7 +272,7 @@ class InviteListPresenterTests {
             invitesDataSource = invitesDataSource,
         )
         val room = FakeMatrixRoom()
-        val presenter = InviteListPresenter(client)
+        val presenter = InviteListPresenter(client, FakeSeenInvitesStore())
         val ex = Throwable("Ruh roh!")
         room.givenRejectInviteResult(Result.failure(ex))
         client.givenGetRoomResult(A_ROOM_ID, room)
@@ -311,7 +305,7 @@ class InviteListPresenterTests {
             invitesDataSource = invitesDataSource,
         )
         val room = FakeMatrixRoom()
-        val presenter = InviteListPresenter(client)
+        val presenter = InviteListPresenter(client, FakeSeenInvitesStore())
         client.givenGetRoomResult(A_ROOM_ID, room)
 
         moleculeFlow(RecompositionClock.Immediate) {
@@ -335,7 +329,7 @@ class InviteListPresenterTests {
             invitesDataSource = invitesDataSource,
         )
         val room = FakeMatrixRoom()
-        val presenter = InviteListPresenter(client)
+        val presenter = InviteListPresenter(client, FakeSeenInvitesStore())
         val ex = Throwable("Ruh roh!")
         room.givenAcceptInviteResult(Result.failure(ex))
         client.givenGetRoomResult(A_ROOM_ID, room)
@@ -361,7 +355,7 @@ class InviteListPresenterTests {
             invitesDataSource = invitesDataSource,
         )
         val room = FakeMatrixRoom()
-        val presenter = InviteListPresenter(client)
+        val presenter = InviteListPresenter(client, FakeSeenInvitesStore())
         val ex = Throwable("Ruh roh!")
         room.givenAcceptInviteResult(Result.failure(ex))
         client.givenGetRoomResult(A_ROOM_ID, room)
@@ -381,6 +375,71 @@ class InviteListPresenterTests {
         }
     }
 
+    @Test
+    fun `present - stores seen invites when received`() = runTest {
+        val invitesDataSource = FakeRoomSummaryDataSource()
+        val store = FakeSeenInvitesStore()
+        val presenter = InviteListPresenter(
+            FakeMatrixClient(
+                sessionId = A_SESSION_ID,
+                invitesDataSource = invitesDataSource,
+            ),
+            store,
+        )
+        moleculeFlow(RecompositionClock.Immediate) {
+            presenter.present()
+        }.test {
+            awaitItem()
+
+            // When one invite is received, that ID is saved
+            invitesDataSource.postRoomSummary(listOf(aRoomSummary()))
+
+            awaitItem()
+            Truth.assertThat(store.getProvidedRoomIds()).isEqualTo(setOf(A_ROOM_ID))
+
+            // When a second is added, both are saved
+            invitesDataSource.postRoomSummary(listOf(aRoomSummary(), aRoomSummary(A_ROOM_ID_2)))
+
+            awaitItem()
+            Truth.assertThat(store.getProvidedRoomIds()).isEqualTo(setOf(A_ROOM_ID, A_ROOM_ID_2))
+
+            // When they're both dismissed, an empty set is saved
+            invitesDataSource.postRoomSummary(listOf())
+
+            awaitItem()
+            Truth.assertThat(store.getProvidedRoomIds()).isEmpty()
+        }
+    }
+
+    @Test
+    fun `present - marks invite as new if they're unseen`() = runTest {
+        val invitesDataSource = FakeRoomSummaryDataSource()
+        val store = FakeSeenInvitesStore()
+        store.publishRoomIds(setOf(A_ROOM_ID))
+        val presenter = InviteListPresenter(
+            FakeMatrixClient(
+                sessionId = A_SESSION_ID,
+                invitesDataSource = invitesDataSource,
+            ),
+            store,
+        )
+        moleculeFlow(RecompositionClock.Immediate) {
+            presenter.present()
+        }.test {
+            awaitItem()
+
+            invitesDataSource.postRoomSummary(listOf(aRoomSummary(), aRoomSummary(A_ROOM_ID_2)))
+            skipItems(1)
+
+            val withInviteState = awaitItem()
+            Truth.assertThat(withInviteState.inviteList.size).isEqualTo(2)
+            Truth.assertThat(withInviteState.inviteList[0].roomId).isEqualTo(A_ROOM_ID)
+            Truth.assertThat(withInviteState.inviteList[0].isNew).isFalse()
+            Truth.assertThat(withInviteState.inviteList[1].roomId).isEqualTo(A_ROOM_ID_2)
+            Truth.assertThat(withInviteState.inviteList[1].isNew).isTrue()
+        }
+    }
+
     private suspend fun FakeRoomSummaryDataSource.withRoomInvitation(): FakeRoomSummaryDataSource {
         postRoomSummary(
             listOf(
@@ -438,4 +497,17 @@ class InviteListPresenterTests {
         )
         return this
     }
+
+    private fun aRoomSummary(id: RoomId = A_ROOM_ID) = RoomSummary.Filled(
+        RoomSummaryDetails(
+            roomId = id,
+            name = A_ROOM_NAME,
+            avatarURLString = null,
+            isDirect = false,
+            lastMessage = null,
+            lastMessageTimestamp = null,
+            unreadNotificationCount = 0,
+        )
+    )
+
 }
diff --git a/features/invitelist/test/build.gradle.kts b/features/invitelist/test/build.gradle.kts
new file mode 100644
index 0000000000..ce9b0dabe4
--- /dev/null
+++ b/features/invitelist/test/build.gradle.kts
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.invitelist.test"
+}
+
+dependencies {
+    implementation(libs.coroutines.core)
+    implementation(projects.libraries.matrix.api)
+    api(projects.features.invitelist.api)
+}
diff --git a/features/invitelist/test/src/main/kotlin/io/element/android/features/invitelist/test/FakeSeenInvitesStore.kt b/features/invitelist/test/src/main/kotlin/io/element/android/features/invitelist/test/FakeSeenInvitesStore.kt
new file mode 100644
index 0000000000..3716cd4456
--- /dev/null
+++ b/features/invitelist/test/src/main/kotlin/io/element/android/features/invitelist/test/FakeSeenInvitesStore.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.invitelist.test
+
+import io.element.android.features.invitelist.api.SeenInvitesStore
+import io.element.android.libraries.matrix.api.core.RoomId
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+
+class FakeSeenInvitesStore : SeenInvitesStore {
+
+    private var existing = MutableStateFlow(emptySet<RoomId>())
+    private var provided: Set<RoomId>? = null
+
+    fun publishRoomIds(invites: Set<RoomId>) {
+        existing.value = invites
+    }
+
+    fun getProvidedRoomIds() = provided
+
+    override fun seenRoomIds(): Flow<Set<RoomId>> = existing
+
+    override suspend fun markAsSeen(roomIds: Set<RoomId>) {
+        provided = roomIds.toSet()
+    }
+}
diff --git a/features/roomlist/impl/build.gradle.kts b/features/roomlist/impl/build.gradle.kts
index 3f5da09c79..9150ff4c95 100644
--- a/features/roomlist/impl/build.gradle.kts
+++ b/features/roomlist/impl/build.gradle.kts
@@ -48,6 +48,7 @@ dependencies {
     implementation(projects.libraries.testtags)
     implementation(projects.libraries.uiStrings)
     implementation(projects.libraries.dateformatter.api)
+    implementation(projects.features.invitelist.api)
     implementation(projects.features.networkmonitor.api)
     implementation(libs.accompanist.placeholder)
     api(projects.features.roomlist.api)
@@ -61,8 +62,10 @@ dependencies {
     testImplementation(libs.test.robolectric)
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.dateformatter.test)
-    testImplementation(projects.features.networkmonitor.test)
     testImplementation(projects.libraries.permissions.noop)
+    testImplementation(projects.features.invitelist.test)
+    testImplementation(projects.features.networkmonitor.test)
+    testImplementation(projects.tests.testutils)
 
     androidTestImplementation(libs.test.junitext)
 }
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/DefaultInviteStateDataSource.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/DefaultInviteStateDataSource.kt
new file mode 100644
index 0000000000..74697a5c06
--- /dev/null
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/DefaultInviteStateDataSource.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.roomlist.impl
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import com.squareup.anvil.annotations.ContributesBinding
+import io.element.android.features.invitelist.api.SeenInvitesStore
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.RoomSummary
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+@ContributesBinding(SessionScope::class)
+class DefaultInviteStateDataSource @Inject constructor(
+    private val client: MatrixClient,
+    private val seenInvitesStore: SeenInvitesStore,
+    private val coroutineDispatchers: CoroutineDispatchers,
+) : InviteStateDataSource {
+
+    @Composable
+    override fun inviteState(): InvitesState {
+        val invites by client
+            .invitesDataSource
+            .roomSummaries()
+            .collectAsState()
+
+        val seenInvites by seenInvitesStore
+            .seenRoomIds()
+            .collectAsState(initial = emptySet())
+
+        var state by remember { mutableStateOf(InvitesState.NoInvites) }
+
+        LaunchedEffect(invites, seenInvites) {
+            withContext(coroutineDispatchers.computation) {
+                state = when {
+                    invites.isEmpty() -> InvitesState.NoInvites
+                    seenInvites.containsAll(invites.roomIds) -> InvitesState.SeenInvites
+                    else -> InvitesState.NewInvites
+                }
+            }
+        }
+
+        return state
+    }
+}
+
+private val List<RoomSummary>.roomIds: Collection<RoomId>
+    get() = filterIsInstance<RoomSummary.Filled>().map { it.details.roomId }
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/InviteStateDataSource.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/InviteStateDataSource.kt
new file mode 100644
index 0000000000..e236c206c5
--- /dev/null
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/InviteStateDataSource.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.roomlist.impl
+
+import androidx.compose.runtime.Composable
+
+interface InviteStateDataSource {
+
+    @Composable
+    fun inviteState(): InvitesState
+
+}
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt
index 43f822d1f4..59faa5afbe 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt
@@ -61,6 +61,7 @@ class RoomListPresenter @Inject constructor(
     private val sessionVerificationService: SessionVerificationService,
     private val networkMonitor: NetworkMonitor,
     private val snackbarDispatcher: SnackbarDispatcher,
+    private val inviteStateDataSource: InviteStateDataSource,
 ) : Presenter<RoomListState> {
 
     @Composable
@@ -86,13 +87,6 @@ class RoomListPresenter @Inject constructor(
             initialLoad(matrixUser)
         }
 
-        val invites by client
-            .invitesDataSource
-            .roomSummaries()
-            .collectAsState()
-
-        Timber.v("Invites size = ${invites.size}")
-
         // Session verification status (unknown, not verified, verified)
         val sessionVerifiedStatus by sessionVerificationService.sessionVerifiedStatus.collectAsState()
         var verificationPromptDismissed by rememberSaveable { mutableStateOf(false) }
@@ -112,7 +106,7 @@ class RoomListPresenter @Inject constructor(
                     if (displaySearchResults) {
                         filter = ""
                     }
-                    displaySearchResults =! displaySearchResults
+                    displaySearchResults = !displaySearchResults
                 }
             }
         }
@@ -136,7 +130,7 @@ class RoomListPresenter @Inject constructor(
             displayVerificationPrompt = displayVerificationPrompt,
             snackbarMessage = snackbarMessage,
             hasNetworkConnection = networkConnectionStatus == NetworkStatus.Online,
-            displayInvites = invites.isNotEmpty(),
+            invitesState = inviteStateDataSource.inviteState(),
             displaySearchResults = displaySearchResults,
             eventSink = ::handleEvents
         )
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt
index 0afc88a8e2..0f8de1046d 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt
@@ -31,7 +31,13 @@ data class RoomListState(
     val displayVerificationPrompt: Boolean,
     val hasNetworkConnection: Boolean,
     val snackbarMessage: SnackbarMessage?,
-    val displayInvites: Boolean,
+    val invitesState: InvitesState,
     val displaySearchResults: Boolean,
     val eventSink: (RoomListEvents) -> Unit
 )
+
+enum class InvitesState {
+    NoInvites,
+    SeenInvites,
+    NewInvites,
+}
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt
index 154dd37a9c..8bd6537d52 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt
@@ -35,7 +35,8 @@ open class RoomListStateProvider : PreviewParameterProvider<RoomListState> {
             aRoomListState().copy(displayVerificationPrompt = true),
             aRoomListState().copy(snackbarMessage = SnackbarMessage(StringR.string.common_verification_complete)),
             aRoomListState().copy(hasNetworkConnection = false),
-            aRoomListState().copy(displayInvites = true),
+            aRoomListState().copy(invitesState = InvitesState.SeenInvites),
+            aRoomListState().copy(invitesState = InvitesState.NewInvites),
             aRoomListState().copy(displaySearchResults = true, filter = "", filteredRoomList = persistentListOf()),
             aRoomListState().copy(displaySearchResults = true),
         )
@@ -49,7 +50,7 @@ internal fun aRoomListState() = RoomListState(
     hasNetworkConnection = true,
     snackbarMessage = null,
     displayVerificationPrompt = false,
-    displayInvites = false,
+    invitesState = InvitesState.NoInvites,
     displaySearchResults = false,
     eventSink = {}
 )
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
index cd42548007..d41b8c28fc 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
@@ -206,19 +206,23 @@ fun RoomListContent(
                         }
                     }
 
-                    if (state.displayInvites) {
+                    if (state.invitesState != InvitesState.NoInvites) {
                         item {
                             Row(horizontalArrangement = Arrangement.End, modifier = Modifier.fillMaxSize()) {
                                 TextButton(
                                     content = {
                                         Text(stringResource(StringR.string.action_invites_list))
-                                        Spacer(Modifier.size(8.dp))
-                                        Box(
-                                            modifier = Modifier
-                                                .size(12.dp)
-                                                .clip(CircleShape)
-                                                .background(MaterialTheme.roomListUnreadIndicator())
-                                        )
+
+                                        if (state.invitesState == InvitesState.NewInvites) {
+                                            Spacer(Modifier.size(8.dp))
+
+                                            Box(
+                                                modifier = Modifier
+                                                    .size(12.dp)
+                                                    .clip(CircleShape)
+                                                    .background(MaterialTheme.roomListUnreadIndicator())
+                                            )
+                                        }
                                     },
                                     onClick = onInvitesClicked,
                                 )
diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/DefaultInviteStateDataSourceTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/DefaultInviteStateDataSourceTest.kt
new file mode 100644
index 0000000000..28b8219189
--- /dev/null
+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/DefaultInviteStateDataSourceTest.kt
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.roomlist.impl
+
+import app.cash.molecule.RecompositionClock
+import app.cash.molecule.moleculeFlow
+import app.cash.turbine.test
+import com.google.common.truth.Truth
+import io.element.android.features.invitelist.test.FakeSeenInvitesStore
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_ROOM_ID_2
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.room.FakeRoomSummaryDataSource
+import io.element.android.libraries.matrix.test.room.aRoomSummaryFilled
+import io.element.android.tests.testutils.testCoroutineDispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+@OptIn(ExperimentalCoroutinesApi::class)
+internal class DefaultInviteStateDataSourceTest {
+
+    @Test
+    fun `emits NoInvites state if invites list is empty`() = runTest {
+        val matrixDataSource = FakeRoomSummaryDataSource()
+        val client = FakeMatrixClient(invitesDataSource = matrixDataSource)
+        val seenStore = FakeSeenInvitesStore()
+        val dataSource = DefaultInviteStateDataSource(client, seenStore, testCoroutineDispatchers())
+
+        moleculeFlow(RecompositionClock.Immediate) {
+            dataSource.inviteState()
+        }.test {
+            Truth.assertThat(awaitItem()).isEqualTo(InvitesState.NoInvites)
+        }
+    }
+
+    @Test
+    fun `emits NewInvites state if unseen invite exists`() = runTest {
+        val matrixDataSource = FakeRoomSummaryDataSource()
+        matrixDataSource.postRoomSummary(listOf(aRoomSummaryFilled(roomId = A_ROOM_ID)))
+        val client = FakeMatrixClient(invitesDataSource = matrixDataSource)
+        val seenStore = FakeSeenInvitesStore()
+        val dataSource = DefaultInviteStateDataSource(client, seenStore, testCoroutineDispatchers())
+
+        moleculeFlow(RecompositionClock.Immediate) {
+            dataSource.inviteState()
+        }.test {
+            skipItems(1)
+            Truth.assertThat(awaitItem()).isEqualTo(InvitesState.NewInvites)
+        }
+    }
+
+    @Test
+    fun `emits NewInvites state if multiple invites exist and at least one is unseen`() = runTest {
+        val matrixDataSource = FakeRoomSummaryDataSource()
+        matrixDataSource.postRoomSummary(listOf(aRoomSummaryFilled(roomId = A_ROOM_ID), aRoomSummaryFilled(roomId = A_ROOM_ID_2)))
+        val client = FakeMatrixClient(invitesDataSource = matrixDataSource)
+        val seenStore = FakeSeenInvitesStore()
+        seenStore.publishRoomIds(setOf(A_ROOM_ID))
+        val dataSource = DefaultInviteStateDataSource(client, seenStore, testCoroutineDispatchers())
+
+        moleculeFlow(RecompositionClock.Immediate) {
+            dataSource.inviteState()
+        }.test {
+            skipItems(1)
+            Truth.assertThat(awaitItem()).isEqualTo(InvitesState.NewInvites)
+        }
+    }
+
+    @Test
+    fun `emits SeenInvites state if invite exists in seen store`() = runTest {
+        val matrixDataSource = FakeRoomSummaryDataSource()
+        matrixDataSource.postRoomSummary(listOf(aRoomSummaryFilled(roomId = A_ROOM_ID)))
+        val client = FakeMatrixClient(invitesDataSource = matrixDataSource)
+        val seenStore = FakeSeenInvitesStore()
+        seenStore.publishRoomIds(setOf(A_ROOM_ID))
+        val dataSource = DefaultInviteStateDataSource(client, seenStore, testCoroutineDispatchers())
+
+        moleculeFlow(RecompositionClock.Immediate) {
+            dataSource.inviteState()
+        }.test {
+            skipItems(1)
+
+            Truth.assertThat(awaitItem()).isEqualTo(InvitesState.SeenInvites)
+        }
+    }
+
+    @Test
+    fun `emits new state in response to upstream events`() = runTest {
+        val matrixDataSource = FakeRoomSummaryDataSource()
+        val client = FakeMatrixClient(invitesDataSource = matrixDataSource)
+        val seenStore = FakeSeenInvitesStore()
+        val dataSource = DefaultInviteStateDataSource(client, seenStore, testCoroutineDispatchers())
+
+        moleculeFlow(RecompositionClock.Immediate) {
+            dataSource.inviteState()
+        }.test {
+            // Initially there are no invites
+            Truth.assertThat(awaitItem()).isEqualTo(InvitesState.NoInvites)
+
+            // When a single invite is received, state should be NewInvites
+            matrixDataSource.postRoomSummary(listOf(aRoomSummaryFilled(roomId = A_ROOM_ID)))
+            skipItems(1)
+            Truth.assertThat(awaitItem()).isEqualTo(InvitesState.NewInvites)
+
+            // If that invite is marked as seen, then the state becomes SeenInvites
+            seenStore.publishRoomIds(setOf(A_ROOM_ID))
+            skipItems(1)
+            Truth.assertThat(awaitItem()).isEqualTo(InvitesState.SeenInvites)
+
+            // Another new invite resets it to NewInvites
+            matrixDataSource.postRoomSummary(listOf(aRoomSummaryFilled(roomId = A_ROOM_ID), aRoomSummaryFilled(roomId = A_ROOM_ID_2)))
+            skipItems(1)
+            Truth.assertThat(awaitItem()).isEqualTo(InvitesState.NewInvites)
+
+            // All of the invites going away reverts to NoInvites
+            matrixDataSource.postRoomSummary(emptyList())
+            skipItems(1)
+            Truth.assertThat(awaitItem()).isEqualTo(InvitesState.NoInvites)
+        }
+    }
+
+}
diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/FakeInviteDataSource.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/FakeInviteDataSource.kt
new file mode 100644
index 0000000000..083fd1ec70
--- /dev/null
+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/FakeInviteDataSource.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.roomlist.impl
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
+
+class FakeInviteDataSource(
+    private val flow: Flow<InvitesState> = flowOf()
+) : InviteStateDataSource {
+
+    @Composable
+    override fun inviteState(): InvitesState {
+        val state = flow.collectAsState(initial = InvitesState.NoInvites)
+        return state.value
+    }
+}
diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt
index 7f7743aae9..9030b818bc 100644
--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt
+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt
@@ -38,10 +38,12 @@ import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.room.FakeRoomSummaryDataSource
 import io.element.android.libraries.matrix.test.room.aRoomSummaryFilled
 import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
-class RoomListPresenterTests {
+@OptIn(ExperimentalCoroutinesApi::class) class RoomListPresenterTests {
 
     @Test
     fun `present - should start with no user and then load user with success`() = runTest {
@@ -52,6 +54,7 @@ class RoomListPresenterTests {
             FakeSessionVerificationService(),
             FakeNetworkMonitor(),
             SnackbarDispatcher(),
+            FakeInviteDataSource(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -79,6 +82,7 @@ class RoomListPresenterTests {
             FakeSessionVerificationService(),
             FakeNetworkMonitor(),
             SnackbarDispatcher(),
+            FakeInviteDataSource(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -99,6 +103,7 @@ class RoomListPresenterTests {
             FakeSessionVerificationService(),
             FakeNetworkMonitor(),
             SnackbarDispatcher(),
+            FakeInviteDataSource(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -127,6 +132,7 @@ class RoomListPresenterTests {
             FakeSessionVerificationService(),
             FakeNetworkMonitor(),
             SnackbarDispatcher(),
+            FakeInviteDataSource(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -158,6 +164,7 @@ class RoomListPresenterTests {
             FakeSessionVerificationService(),
             FakeNetworkMonitor(),
             SnackbarDispatcher(),
+            FakeInviteDataSource(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -195,6 +202,7 @@ class RoomListPresenterTests {
             FakeSessionVerificationService(),
             FakeNetworkMonitor(),
             SnackbarDispatcher(),
+            FakeInviteDataSource(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -245,6 +253,7 @@ class RoomListPresenterTests {
             },
             FakeNetworkMonitor(),
             SnackbarDispatcher(),
+            FakeInviteDataSource(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -258,31 +267,34 @@ class RoomListPresenterTests {
     }
 
     @Test
-    fun `present - displays invites row if any invites exist`() = runTest {
-        val invitesDataSource = FakeRoomSummaryDataSource()
+    fun `present - sets invite state`() = runTest {
+        val inviteStateFlow = MutableStateFlow(InvitesState.NoInvites)
         val presenter = RoomListPresenter(
             FakeMatrixClient(
                 sessionId = A_SESSION_ID,
-                invitesDataSource = invitesDataSource
             ),
             createDateFormatter(),
             FakeRoomLastMessageFormatter(),
             FakeSessionVerificationService(),
             FakeNetworkMonitor(),
             SnackbarDispatcher(),
+            FakeInviteDataSource(inviteStateFlow),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
         }.test {
             skipItems(1)
 
-            Truth.assertThat(awaitItem().displayInvites).isFalse()
+            Truth.assertThat(awaitItem().invitesState).isEqualTo(InvitesState.NoInvites)
 
-            invitesDataSource.postRoomSummary(listOf(aRoomSummaryFilled()))
-            Truth.assertThat(awaitItem().displayInvites).isTrue()
+            inviteStateFlow.value = InvitesState.SeenInvites
+            Truth.assertThat(awaitItem().invitesState).isEqualTo(InvitesState.SeenInvites)
 
-            invitesDataSource.postRoomSummary(listOf())
-            Truth.assertThat(awaitItem().displayInvites).isFalse()
+            inviteStateFlow.value = InvitesState.NewInvites
+            Truth.assertThat(awaitItem().invitesState).isEqualTo(InvitesState.NewInvites)
+
+            inviteStateFlow.value = InvitesState.NoInvites
+            Truth.assertThat(awaitItem().invitesState).isEqualTo(InvitesState.NoInvites)
         }
     }
 
diff --git a/samples/minimal/build.gradle.kts b/samples/minimal/build.gradle.kts
index 6e2acf7e8a..83e358ad48 100644
--- a/samples/minimal/build.gradle.kts
+++ b/samples/minimal/build.gradle.kts
@@ -46,6 +46,7 @@ android {
 
 dependencies {
     implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.preference)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrix.impl)
     implementation(projects.libraries.permissions.noop)
@@ -54,6 +55,7 @@ dependencies {
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.core)
     implementation(projects.libraries.dateformatter.impl)
+    implementation(projects.features.invitelist.impl)
     implementation(projects.features.roomlist.impl)
     implementation(projects.features.login.impl)
     implementation(projects.features.networkmonitor.impl)
diff --git a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt
index 9911e1f969..df1f052e79 100644
--- a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt
+++ b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt
@@ -20,20 +20,26 @@ import android.content.Context
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.Modifier
+import io.element.android.features.invitelist.impl.DefaultSeenInvitesStore
 import io.element.android.features.networkmonitor.impl.NetworkMonitorImpl
+import io.element.android.features.roomlist.impl.DefaultInviteStateDataSource
 import io.element.android.features.roomlist.impl.DefaultRoomLastMessageFormatter
 import io.element.android.features.roomlist.impl.RoomListPresenter
 import io.element.android.features.roomlist.impl.RoomListView
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.dateformatter.impl.DateFormatters
 import io.element.android.libraries.dateformatter.impl.DefaultLastMessageTimestampFormatter
 import io.element.android.libraries.dateformatter.impl.LocalDateTimeProvider
 import io.element.android.libraries.designsystem.utils.SnackbarDispatcher
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
 import java.util.Locale
+import java.util.concurrent.Executors
 
 class RoomListScreen(
     context: Context,
@@ -52,6 +58,16 @@ class RoomListScreen(
         sessionVerificationService = sessionVerificationService,
         networkMonitor = NetworkMonitorImpl(context),
         snackbarDispatcher = SnackbarDispatcher(),
+        inviteStateDataSource = DefaultInviteStateDataSource(
+            matrixClient,
+            DefaultSeenInvitesStore(context),
+            CoroutineDispatchers(
+                io = Dispatchers.IO,
+                computation = Dispatchers.Default,
+                main = Dispatchers.Main,
+                diffUpdateDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
+            )
+        )
     )
 
     @Composable
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowDarkPreview_0_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowDarkPreview_0_null_0,NEXUS_5,1.0,en].png
index f29850a9ef..2c32353b1a 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowDarkPreview_0_null_0,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowDarkPreview_0_null_0,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b63f562e8b5360a66546fdd6e77de9a23530338b0e1a031c5c2d052f585985b
-size 48392
+oid sha256:a93f55fcc13131a84047147626b21abccc253c3e7e131afd56f85dfed783563f
+size 48527
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowDarkPreview_0_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowDarkPreview_0_null_1,NEXUS_5,1.0,en].png
index 90d734eb69..d487609ccb 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowDarkPreview_0_null_1,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowDarkPreview_0_null_1,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f6d775fe3ecffe0c60b931e6d951a7da20d9832d940076d972821d268c58361
-size 59646
+oid sha256:db30fa092d0d6d2158ec0f6d5fe1ca9b2707e648f0067e431584aa9f721a04a9
+size 59721
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowDarkPreview_0_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowDarkPreview_0_null_2,NEXUS_5,1.0,en].png
index cd911fccdf..8507c667d6 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowDarkPreview_0_null_2,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowDarkPreview_0_null_2,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a57b775eaad1b6e211d47588048c3722ec76083ca515ccface863b15ee497b5b
-size 34216
+oid sha256:71e7579a781fb092c14614b86736d16f168fd34e8cd30937b899601285bc5db9
+size 34299
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowDarkPreview_0_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowDarkPreview_0_null_3,NEXUS_5,1.0,en].png
new file mode 100644
index 0000000000..9fe52f1324
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowDarkPreview_0_null_3,NEXUS_5,1.0,en].png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39ce49cd2193bcf2439845835c469ce5e6b0304536ba403f679e0ea76e77a85c
+size 49400
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowLightPreview_0_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowLightPreview_0_null_0,NEXUS_5,1.0,en].png
index c3e246dc83..f25d82c16d 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowLightPreview_0_null_0,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowLightPreview_0_null_0,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:682acde00a6cbf13aa356ff4ec91368b11eae9fa2f8750d1590ceea334045ebd
-size 47079
+oid sha256:eef4fb6ed40c5b81737c967150694f2c7e3b3ecb09f50dabee92596ec80fc6b8
+size 47082
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowLightPreview_0_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowLightPreview_0_null_1,NEXUS_5,1.0,en].png
index fc06918af1..9f323af7c2 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowLightPreview_0_null_1,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowLightPreview_0_null_1,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:237e3727252f29ec3953fb0a27d6cee741cd5b485c9466e81799315f3852f0c7
-size 58267
+oid sha256:566de16a101483d6bca48ee95037699e56c2b8b0fb5161ddbde4cbbc30f0e08c
+size 58261
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowLightPreview_0_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowLightPreview_0_null_2,NEXUS_5,1.0,en].png
index c547e70f72..bcf9272224 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowLightPreview_0_null_2,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowLightPreview_0_null_2,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2a733da2b24280b2d096e458a8bf470f2f8279008cc823553eee1072e9e3df5
-size 33238
+oid sha256:0998c041de2ca2f7ccfd8c6fa3bc14201610cd66ce79b1e17be6b1d0c62f98e9
+size 33275
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowLightPreview_0_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowLightPreview_0_null_3,NEXUS_5,1.0,en].png
new file mode 100644
index 0000000000..ad3f3f601a
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl.components_null_DefaultGroup_InviteSummaryRowLightPreview_0_null_3,NEXUS_5,1.0,en].png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2a14823ece6aaf58128b3615e1c012dd906ae58b5ff52cb2b0841b49e43361d
+size 47924
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_0,NEXUS_5,1.0,en].png
index 52a6870369..d17a4b34f4 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_0,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_0,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e4e085e53b63f83a51bb726fc3f38f37c8fb6412e5b8ed3ec893b24c87fa63a4
-size 56723
+oid sha256:fc812d7b9418a67040d8bd9a007444d611c00108662064baf79ae5805432f081
+size 56695
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_2,NEXUS_5,1.0,en].png
index 94c3b51668..c950b8b50b 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_2,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_2,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8e44bafcf2fd7119562d6a92a8deff74a7ba470b4a7a87951cf77e19eee2eb0
-size 43576
+oid sha256:4031fc3820333ed5b28f2356792b957bc38cba1559b599b0ac0fef66074252e0
+size 43572
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_3,NEXUS_5,1.0,en].png
index 3d7a087e66..cc8d5f3f7b 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_3,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_3,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b72ad15218e4f17b1c47018925194f3b21c70630bf8744395352707dc257ab70
-size 44025
+oid sha256:8936f72285c8a0f483080a4ff007703e40f187abfe0f67bb3ae33eb57901a1af
+size 44022
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_4,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_4,NEXUS_5,1.0,en].png
index 7ab4a16b81..808557b368 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_4,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_4,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac02a683f4a6297427e6e74bd331c45e9ee7efb044767568bc46566ae46f2274
-size 39618
+oid sha256:6dd33c2e92caac62963ccc75c068aa2b27037fe075b48823d2a8b75c88b4f661
+size 39408
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_5,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_5,NEXUS_5,1.0,en].png
index 7ab4a16b81..808557b368 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_5,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_5,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac02a683f4a6297427e6e74bd331c45e9ee7efb044767568bc46566ae46f2274
-size 39618
+oid sha256:6dd33c2e92caac62963ccc75c068aa2b27037fe075b48823d2a8b75c88b4f661
+size 39408
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_0,NEXUS_5,1.0,en].png
index 9e3beed13b..318b047716 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_0,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_0,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:151331de0ea941330ff611e312833aa9c731ed0cd49ed4f31f724dbb5c7ba252
-size 55174
+oid sha256:e87dd78bba7e3fd682e647258d989e5d720b7a0e879d698f96611b98867cdaaf
+size 55009
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_2,NEXUS_5,1.0,en].png
index 35c6b52fc3..172ce72e79 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_2,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_2,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8e00ba1ff01242bf3e1f4858cb66b5ed87681aec76090a545e8d729361e5e37
-size 43034
+oid sha256:dbd348146e2161e9b2a57af31d0ad48c44dd5f0274fbebfd885ea628235e08f9
+size 42903
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_3,NEXUS_5,1.0,en].png
index fe3e7b9cf6..1fc52b82ef 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_3,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_3,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27b3164386391fc115d3ecdcf202495a3f03509c2c2c5564880ed756d56ed3b5
-size 43463
+oid sha256:9c7eb8bd040fb4321ecf28b5e00619f5356f23e5b07f59feb3894dc6620b9643
+size 43335
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_4,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_4,NEXUS_5,1.0,en].png
index 05598c9c54..fc78832b0d 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_4,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_4,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64ec3959fddb9dccc271ac0fa28275fa43df893f8f672b99f9f594004cef438e
-size 39052
+oid sha256:63e2e25f5e92c1890dd23ccc8f0e9c352587c0ac1190c012e430c21b7b8d728e
+size 38709
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_5,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_5,NEXUS_5,1.0,en].png
index 05598c9c54..fc78832b0d 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_5,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.invitelist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_5,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64ec3959fddb9dccc271ac0fa28275fa43df893f8f672b99f9f594004cef438e
-size 39052
+oid sha256:63e2e25f5e92c1890dd23ccc8f0e9c352587c0ac1190c012e430c21b7b8d728e
+size 38709
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_4,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_4,NEXUS_5,1.0,en].png
index e7c9ed7df3..fd2641e5f2 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_4,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_4,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2a23141c6cc8aa6e7e5f0757bda4d1117bf7f752412ccc4649ea560113b3e3f
-size 39030
+oid sha256:6b6263f24f080bbf87704a8bf8784fdfab360c08fbf1cd048f82b2db84f7611d
+size 38738
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_5,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_5,NEXUS_5,1.0,en].png
index 069af4cecf..e7c9ed7df3 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_5,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_5,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9095546c30bb5bc9800c852456fa9cd82d14e873a5e1488d29496af088e951da
-size 4882
+oid sha256:c2a23141c6cc8aa6e7e5f0757bda4d1117bf7f752412ccc4649ea560113b3e3f
+size 39030
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_6,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_6,NEXUS_5,1.0,en].png
index 9861b7572e..069af4cecf 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_6,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_6,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8cfe321535e1ce223a0460435123dc59e74c436bdd8696cf4bdb2169f511832b
-size 28541
+oid sha256:9095546c30bb5bc9800c852456fa9cd82d14e873a5e1488d29496af088e951da
+size 4882
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_7,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_7,NEXUS_5,1.0,en].png
new file mode 100644
index 0000000000..9861b7572e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewDarkPreview_0_null_7,NEXUS_5,1.0,en].png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8cfe321535e1ce223a0460435123dc59e74c436bdd8696cf4bdb2169f511832b
+size 28541
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_4,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_4,NEXUS_5,1.0,en].png
index 5793650c81..76e1ca7bbd 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_4,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_4,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d427b479f9eb6227bb92aecd997bab97a735ef85dd279a575d777e754effd258
-size 38639
+oid sha256:fa79302cd00b188661ef35107645568741eb04ebde4d6d8f31c5c044ec5c2d6f
+size 38310
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_5,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_5,NEXUS_5,1.0,en].png
index 6c14f8062c..5793650c81 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_5,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_5,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d463ab6d045cc310973c5ff900cf4d9ae04e93cb1c7eac3f9b2aa0ea9b827cee
-size 4815
+oid sha256:d427b479f9eb6227bb92aecd997bab97a735ef85dd279a575d777e754effd258
+size 38639
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_6,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_6,NEXUS_5,1.0,en].png
index b113ba20f0..6c14f8062c 100644
--- a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_6,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_6,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97b11203623c0c98da88dfedf85cb80d1f35cc55da570e12061b1385691bf1f0
-size 27758
+oid sha256:d463ab6d045cc310973c5ff900cf4d9ae04e93cb1c7eac3f9b2aa0ea9b827cee
+size 4815
diff --git a/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_7,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_7,NEXUS_5,1.0,en].png
new file mode 100644
index 0000000000..b113ba20f0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/io.element.android.tests.uitests_ScreenshotTest_preview_tests[io.element.android.features.roomlist.impl_null_DefaultGroup_RoomListViewLightPreview_0_null_7,NEXUS_5,1.0,en].png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97b11203623c0c98da88dfedf85cb80d1f35cc55da570e12061b1385691bf1f0
+size 27758