diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt
index 36e0bbc56a..09604c0d94 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/HomeSpacesView.kt
@@ -33,11 +33,7 @@ fun HomeSpacesView(
         when (space) {
             CurrentSpace.Root -> {
                 item {
-                    SpaceHeaderRootView(
-                        numberOfSpaces = state.spaceRooms.size,
-                        // TODO
-                        numberOfRooms = 0,
-                    )
+                    SpaceHeaderRootView(numberOfSpaces = state.spaceRooms.size)
                 }
             }
             is CurrentSpace.Space -> item {
@@ -45,10 +41,9 @@ fun HomeSpacesView(
                     avatarData = space.spaceRoom.getAvatarData(AvatarSize.SpaceHeader),
                     name = space.spaceRoom.name,
                     topic = space.spaceRoom.topic,
-                    joinRule = space.spaceRoom.joinRule,
+                    visibility = space.spaceRoom.visibility,
                     heroes = space.spaceRoom.heroes.toImmutableList(),
                     numberOfMembers = space.spaceRoom.numJoinedMembers,
-                    numberOfRooms = space.spaceRoom.childrenCount,
                 )
             }
         }
diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt
index 474e08293a..56d441a42e 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/spaces/SpaceRoomProvider.kt
@@ -30,7 +30,7 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
             roomId = RoomId("!spaceId1:example.com"),
         ),
         aSpaceRoom(
-            name = null,
+            rawName = null,
             numJoinedMembers = 5,
             childrenCount = 10,
             worldReadable = true,
@@ -39,7 +39,7 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
             state = CurrentUserMembership.INVITED,
         ),
         aSpaceRoom(
-            name = null,
+            rawName = null,
             numJoinedMembers = 5,
             childrenCount = 10,
             worldReadable = true,
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
index 6da7aadfe7..38d084c7d3 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
@@ -74,7 +74,7 @@ import io.element.android.libraries.designsystem.theme.components.TextField
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.designsystem.theme.placeholderBackground
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
-import io.element.android.libraries.matrix.api.room.join.JoinRule
+import io.element.android.libraries.matrix.api.spaces.SpaceRoomVisibility
 import io.element.android.libraries.matrix.ui.components.SpaceInfoRow
 import io.element.android.libraries.matrix.ui.components.SpaceMembersView
 import io.element.android.libraries.matrix.ui.model.InviteSender
@@ -567,10 +567,7 @@ private fun DefaultLoadedContent(
         subtitle = {
             when {
                 contentState.details is LoadedDetails.Space -> {
-                    SpaceInfoRow(
-                        joinRule = contentState.joinRule ?: JoinRule.Public,
-                        numberOfRooms = contentState.details.childrenCount,
-                    )
+                    SpaceInfoRow(visibility = SpaceRoomVisibility.fromJoinRule(contentState.joinRule))
                 }
                 contentState.alias != null -> {
                     RoomPreviewSubtitleAtom(contentState.alias.value)
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateProvider.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateProvider.kt
index 16eb85442c..85518f8b18 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateProvider.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceStateProvider.kt
@@ -30,7 +30,7 @@ class LeaveSpaceStateProvider : PreviewParameterProvider<LeaveSpaceState> {
                     persistentListOf(
                         aSelectableSpaceRoom(
                             spaceRoom = aSpaceRoom(
-                                name = "A long space name that should be truncated",
+                                rawName = "A long space name that should be truncated",
                                 worldReadable = true,
                             ),
                             isLastAdmin = true,
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt
index c0a88c38f5..b165e9d9ca 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceStateProvider.kt
@@ -13,8 +13,10 @@ import io.element.android.features.invite.api.acceptdecline.anAcceptDeclineInvit
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
+import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import io.element.android.libraries.previewutils.room.aSpaceRoom
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.collections.immutable.toImmutableSet
@@ -25,7 +27,17 @@ open class SpaceStateProvider : PreviewParameterProvider<SpaceState> {
             aSpaceState(),
             aSpaceState(
                 parentSpace = aSpaceRoom(
-                    name = null,
+                    joinRule = JoinRule.Public
+                )
+            ),
+            aSpaceState(
+                parentSpace = aSpaceRoom(
+                    joinRule = JoinRule.Restricted(persistentListOf())
+                )
+            ),
+            aSpaceState(
+                parentSpace = aSpaceRoom(
+                    rawName = null,
                     numJoinedMembers = 5,
                     childrenCount = 10,
                     worldReadable = true,
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt
index 25d4e69b9c..a4615ffc9d 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt
@@ -134,10 +134,9 @@ private fun SpaceViewContent(
                     avatarData = currentSpace.getAvatarData(AvatarSize.SpaceHeader),
                     name = currentSpace.name,
                     topic = currentSpace.topic,
-                    joinRule = currentSpace.joinRule,
+                    visibility = currentSpace.visibility,
                     heroes = currentSpace.heroes.toImmutableList(),
                     numberOfMembers = currentSpace.numJoinedMembers,
-                    numberOfRooms = currentSpace.childrenCount,
                 )
             }
         }
diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt
index 5bdd100c93..7c3336e0fe 100644
--- a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt
+++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/leave/LeaveSpacePresenterTest.kt
@@ -29,7 +29,7 @@ import org.junit.Test
 class LeaveSpacePresenterTest {
     private val aSpace = aSpaceRoom(
         roomId = A_SPACE_ID,
-        name = A_SPACE_NAME,
+        rawName = A_SPACE_NAME,
     )
 
     @Test
@@ -198,7 +198,7 @@ class LeaveSpacePresenterTest {
 private fun aLeaveSpaceRoom(
     spaceRoom: SpaceRoom = aSpaceRoom(
         roomId = A_SPACE_ID,
-        name = A_SPACE_NAME,
+        rawName = A_SPACE_NAME,
     ),
     isLastAdmin: Boolean = false,
 ) = LeaveSpaceRoom(
diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceViewTest.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceViewTest.kt
index f95b4e6514..9e0897cb8f 100644
--- a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceViewTest.kt
+++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceViewTest.kt
@@ -52,7 +52,7 @@ class SpaceViewTest {
 
     @Test
     fun `clicking on a room name invokes the expected callback`() {
-        val aSpaceRoom = aSpaceRoom(roomId = A_ROOM_ID, name = A_ROOM_NAME)
+        val aSpaceRoom = aSpaceRoom(roomId = A_ROOM_ID, rawName = A_ROOM_NAME)
         val eventsRecorder = EventsRecorder<SpaceEvents>(expectEvents = false)
         ensureCalledOnceWithParam(aSpaceRoom) {
             rule.setSpaceView(
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt
index 1e89fd2e98..587cfbcab1 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoom.kt
@@ -15,7 +15,7 @@ import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.user.MatrixUser
 
 data class SpaceRoom(
-    val name: String?,
+    val rawName: String?,
     val avatarUrl: String?,
     val canonicalAlias: RoomAlias?,
     val childrenCount: Int,
@@ -32,6 +32,20 @@ data class SpaceRoom(
      * The via parameters of the room.
      */
     val via: List<String>,
+    val isDirect: Boolean?,
 ) {
     val isSpace = roomType == RoomType.Space
+
+    /**
+     * Temporary logic to compute a name for direct rooms with no name.
+     * This will be replaced by sdk logic in the future.
+     */
+    val name = if (rawName == null && isDirect == true && heroes.size == 1) {
+        val dmRecipient = heroes.first()
+        dmRecipient.displayName
+    } else {
+        rawName
+    }
+
+    val visibility = SpaceRoomVisibility.fromJoinRule(joinRule)
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomVisibility.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomVisibility.kt
new file mode 100644
index 0000000000..98afa1d508
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/spaces/SpaceRoomVisibility.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2025 New Vector 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.matrix.api.spaces
+
+import androidx.compose.runtime.Immutable
+import io.element.android.libraries.matrix.api.room.join.JoinRule
+@Immutable
+sealed interface SpaceRoomVisibility {
+    data object Private : SpaceRoomVisibility
+    data object Public : SpaceRoomVisibility
+    data object Restricted : SpaceRoomVisibility
+
+    companion object {
+        fun fromJoinRule(joinRule: JoinRule?): SpaceRoomVisibility = when (joinRule) {
+            JoinRule.Public -> Public
+            is JoinRule.Restricted, is JoinRule.KnockRestricted -> Restricted
+            // Else fallback to Private
+            else -> Private
+        }
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomMapper.kt
index 7032d052d8..248366aa03 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/spaces/SpaceRoomMapper.kt
@@ -24,7 +24,7 @@ class SpaceRoomMapper {
             guestCanJoin = spaceRoom.guestCanJoin,
             heroes = spaceRoom.heroes.orEmpty().map { it.map() },
             joinRule = spaceRoom.joinRule?.map(),
-            name = spaceRoom.name,
+            rawName = spaceRoom.name,
             numJoinedMembers = spaceRoom.numJoinedMembers.toInt(),
             roomId = RoomId(spaceRoom.roomId),
             roomType = spaceRoom.roomType.map(),
@@ -32,6 +32,7 @@ class SpaceRoomMapper {
             topic = spaceRoom.topic,
             worldReadable = spaceRoom.worldReadable.orFalse(),
             via = spaceRoom.via,
+            isDirect = spaceRoom.isDirect,
         )
     }
 }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderRootView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderRootView.kt
index 22ef102946..9f41171dd9 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderRootView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderRootView.kt
@@ -31,7 +31,6 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun SpaceHeaderRootView(
     numberOfSpaces: Int,
-    numberOfRooms: Int,
     modifier: Modifier = Modifier,
 ) {
     Column(
@@ -52,7 +51,7 @@ fun SpaceHeaderRootView(
         )
         SpaceInfoRow(
             leftText = numberOfSpaces(numberOfSpaces),
-            rightText = numberOfRooms(numberOfRooms),
+            rightText = null,
         )
         Text(
             text = stringResource(CommonStrings.screen_space_list_description),
@@ -68,6 +67,5 @@ fun SpaceHeaderRootView(
 internal fun SpaceHeaderRootViewPreview() = ElementPreview {
     SpaceHeaderRootView(
         numberOfSpaces = 3,
-        numberOfRooms = 10,
     )
 }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderView.kt
index 6dbe7ebf72..e59049f9f2 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceHeaderView.kt
@@ -24,7 +24,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.components.avatar.anAvatarData
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.matrix.api.room.join.JoinRule
+import io.element.android.libraries.matrix.api.spaces.SpaceRoomVisibility
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
@@ -38,10 +38,9 @@ fun SpaceHeaderView(
     avatarData: AvatarData,
     name: String?,
     topic: String?,
-    joinRule: JoinRule?,
+    visibility: SpaceRoomVisibility,
     heroes: ImmutableList<MatrixUser>,
     numberOfMembers: Int,
-    numberOfRooms: Int,
     modifier: Modifier = Modifier,
     topicMaxLines: Int = Int.MAX_VALUE,
 ) {
@@ -64,12 +63,7 @@ fun SpaceHeaderView(
             }
         },
         subtitle = {
-            if (joinRule != null) {
-                SpaceInfoRow(
-                    joinRule = joinRule,
-                    numberOfRooms = numberOfRooms,
-                )
-            }
+            SpaceInfoRow(visibility = visibility)
         },
         description = if (topic.isNullOrBlank()) {
             null
@@ -97,7 +91,7 @@ internal fun SpaceHeaderViewPreview() = ElementPreview {
         name = "Space name",
         topic = "Space topic: " + LoremIpsum(40).values.first(),
         topicMaxLines = 2,
-        joinRule = JoinRule.Public,
+        visibility = SpaceRoomVisibility.Public,
         heroes = persistentListOf(
             aMatrixUser(id = "@1:d", displayName = "Alice", avatarUrl = "aUrl"),
             aMatrixUser(id = "@2:d", displayName = "Bob"),
@@ -105,6 +99,5 @@ internal fun SpaceHeaderViewPreview() = ElementPreview {
             aMatrixUser(id = "@4:d", displayName = "Dave"),
         ),
         numberOfMembers = 999,
-        numberOfRooms = 10,
     )
 }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceInfoRow.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceInfoRow.kt
index 3d973d97ae..d0d14bcdd4 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceInfoRow.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceInfoRow.kt
@@ -27,14 +27,16 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Icon
-import io.element.android.libraries.matrix.api.room.join.JoinRule
+import io.element.android.libraries.matrix.api.spaces.SpaceRoomVisibility
+import io.element.android.libraries.matrix.ui.model.icon
+import io.element.android.libraries.matrix.ui.model.label
 import io.element.android.libraries.ui.strings.CommonPlurals
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun SpaceInfoRow(
     leftText: String,
-    rightText: String,
+    rightText: String?,
     modifier: Modifier = Modifier,
     iconVector: ImageVector? = null,
 ) {
@@ -51,7 +53,11 @@ fun SpaceInfoRow(
                 tint = ElementTheme.colors.iconTertiary,
             )
         }
-        val text = stringResource(id = CommonStrings.screen_space_list_details, leftText, rightText)
+        val text = if (rightText != null) {
+            stringResource(id = CommonStrings.screen_space_list_details, leftText, rightText)
+        } else {
+            leftText
+        }
         Text(
             text = text,
             style = ElementTheme.typography.fontBodyLgRegular,
@@ -63,34 +69,14 @@ fun SpaceInfoRow(
 
 @Composable
 fun SpaceInfoRow(
-    joinRule: JoinRule,
-    numberOfRooms: Int,
+    visibility: SpaceRoomVisibility,
     modifier: Modifier = Modifier,
 ) {
-    val (leftText, rightText, icon) = when (joinRule) {
-        JoinRule.Public -> Triple(
-            stringResource(id = CommonStrings.common_public_space),
-            numberOfRooms(numberOfRooms),
-            CompoundIcons.Public(),
-        )
-        // TODO External space
-        // JoinRule.Private -> Triple(
-        //     stringResource(id = CommonStrings.common_external_space),
-        //     numberOfRooms(numberOfRooms),
-        //     CompoundIcons.Guest(),
-        // )
-        // JoinRule.Private,
-        else -> Triple(
-            stringResource(id = CommonStrings.common_private_space),
-            numberOfRooms(numberOfRooms),
-            CompoundIcons.Lock(),
-        )
-    }
     SpaceInfoRow(
-        leftText = leftText,
-        rightText = rightText,
+        leftText = visibility.label,
+        rightText = null,
         modifier = modifier,
-        iconVector = icon,
+        iconVector = visibility.icon,
     )
 }
 
@@ -124,12 +110,13 @@ internal fun SpaceInfoRowPreview() = ElementPreview {
             iconVector = CompoundIcons.Workspace(),
         )
         SpaceInfoRow(
-            joinRule = JoinRule.Private,
-            numberOfRooms = 4,
+            visibility = SpaceRoomVisibility.Private,
         )
         SpaceInfoRow(
-            joinRule = JoinRule.Public,
-            numberOfRooms = 10,
+            visibility = SpaceRoomVisibility.Public
+        )
+        SpaceInfoRow(
+            visibility = SpaceRoomVisibility.Restricted
         )
     }
 }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomItemView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomItemView.kt
index 1abf0ad95e..2477dd89fd 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomItemView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomItemView.kt
@@ -34,7 +34,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
-import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom
 import io.element.android.libraries.designsystem.atomic.molecules.InviteButtonsRowMolecule
 import io.element.android.libraries.designsystem.components.avatar.Avatar
@@ -48,9 +47,11 @@ import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.unreadIndicator
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
-import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
+import io.element.android.libraries.matrix.api.spaces.SpaceRoomVisibility
 import io.element.android.libraries.matrix.ui.model.getAvatarData
+import io.element.android.libraries.matrix.ui.model.icon
+import io.element.android.libraries.matrix.ui.model.label
 import io.element.android.libraries.ui.strings.CommonPlurals
 import io.element.android.libraries.ui.strings.CommonStrings
 
@@ -117,8 +118,8 @@ private fun SubtitleRow(
         if (visibilityIcon != null) {
             Icon(
                 modifier = Modifier
-                    .size(16.dp)
-                    .padding(end = 4.dp),
+                        .size(16.dp)
+                        .padding(end = 4.dp),
                 imageVector = visibilityIcon,
                 contentDescription = null,
                 tint = ElementTheme.colors.iconTertiary,
@@ -176,20 +177,20 @@ private fun SpaceRoomItemScaffold(
     content: @Composable ColumnScope.() -> Unit,
 ) {
     val clickModifier = Modifier
-        .combinedClickable(
-            onClick = onClick,
-            onLongClick = onLongClick,
-            onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
-            indication = ripple(),
-            interactionSource = remember { MutableInteractionSource() }
-        )
-        .onKeyboardContextMenuAction { onLongClick }
+            .combinedClickable(
+                    onClick = onClick,
+                    onLongClick = onLongClick,
+                    onLongClickLabel = stringResource(CommonStrings.action_open_context_menu),
+                    indication = ripple(),
+                    interactionSource = remember { MutableInteractionSource() }
+            )
+            .onKeyboardContextMenuAction { onLongClick }
     Row(
         modifier = modifier
-            .fillMaxWidth()
-            .then(clickModifier)
-            .padding(horizontal = 16.dp, vertical = 8.dp)
-            .height(IntrinsicSize.Min),
+                .fillMaxWidth()
+                .then(clickModifier)
+                .padding(horizontal = 16.dp, vertical = 8.dp)
+                .height(IntrinsicSize.Min),
     ) {
         Avatar(
             avatarData = avatarData,
@@ -212,11 +213,7 @@ private fun SpaceRoomItemScaffold(
 @ReadOnlyComposable
 private fun SpaceRoom.subtitle(): String {
     return if (isSpace) {
-        if (joinRule == JoinRule.Public) {
-            stringResource(CommonStrings.common_public_space)
-        } else {
-            stringResource(CommonStrings.common_private_space)
-        }
+        visibility.label
     } else {
         pluralStringResource(CommonPlurals.common_member_count, numJoinedMembers, numJoinedMembers)
     }
@@ -226,11 +223,7 @@ private fun SpaceRoom.subtitle(): String {
 @ReadOnlyComposable
 private fun SpaceRoom.info(): String {
     return if (isSpace) {
-        stringResource(
-            CommonStrings.screen_space_list_details,
-            pluralStringResource(CommonPlurals.common_rooms, childrenCount, childrenCount),
-            pluralStringResource(CommonPlurals.common_member_count, numJoinedMembers, numJoinedMembers),
-        )
+        pluralStringResource(CommonPlurals.common_member_count, numJoinedMembers, numJoinedMembers)
     } else {
         topic.orEmpty()
     }
@@ -238,10 +231,11 @@ private fun SpaceRoom.info(): String {
 
 @Composable
 private fun SpaceRoom.visibilityIcon(): ImageVector? {
-    return if (joinRule == JoinRule.Public) {
-        CompoundIcons.Public()
+    // Don't show any icon for restricted rooms as it's the default and would add noise
+    return if (visibility == SpaceRoomVisibility.Restricted) {
+        null
     } else {
-        CompoundIcons.LockSolid()
+        visibility.icon
     }
 }
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomProvider.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomProvider.kt
index bfdfeeac59..a355dd132c 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomProvider.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SpaceRoomProvider.kt
@@ -18,23 +18,31 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
     override val values: Sequence<SpaceRoom> = sequenceOf(
         aSpaceRoom(
             roomType = RoomType.Room,
-            name = "Room name with topic",
+            rawName = "Room name with topic",
             topic = "Room topic that is quite long and might be truncated"
         ),
         aSpaceRoom(
             roomType = RoomType.Room,
-            name = "Room name no topic",
+            rawName = "Room name no topic",
             state = CurrentUserMembership.LEFT,
         ),
         aSpaceRoom(
             roomType = RoomType.Room,
-            name = "Room name with topic",
+            rawName = null,
+            isDirect = true,
+            heroes = listOf(aMatrixUser(displayName = "Alice")),
+            state = CurrentUserMembership.JOINED,
+            numJoinedMembers = 2,
+        ),
+        aSpaceRoom(
+            roomType = RoomType.Room,
+            rawName = "Room name with topic",
             topic = "Room topic that is quite long and might be truncated",
             state = CurrentUserMembership.INVITED,
         ),
         aSpaceRoom(
             roomType = RoomType.Room,
-            name = "Room name no topic",
+            rawName = "Room name no topic",
             state = CurrentUserMembership.INVITED,
         ),
         aSpaceRoom(
@@ -52,7 +60,7 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
             state = CurrentUserMembership.LEFT,
         ),
         aSpaceRoom(
-            name = null,
+            rawName = null,
             numJoinedMembers = 5,
             childrenCount = 10,
             worldReadable = true,
@@ -61,7 +69,7 @@ class SpaceRoomProvider : PreviewParameterProvider<SpaceRoom> {
             state = CurrentUserMembership.INVITED,
         ),
         aSpaceRoom(
-            name = null,
+            rawName = null,
             numJoinedMembers = 5,
             childrenCount = 10,
             worldReadable = true,
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SpaceExtension.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SpaceExtension.kt
index e4b056fdea..779f813aba 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SpaceExtension.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/SpaceExtension.kt
@@ -7,9 +7,16 @@
 
 package io.element.android.libraries.matrix.ui.model
 
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
+import io.element.android.libraries.matrix.api.spaces.SpaceRoomVisibility
+import io.element.android.libraries.ui.strings.CommonStrings
 
 fun SpaceRoom.getAvatarData(size: AvatarSize) = AvatarData(
     id = roomId.value,
@@ -17,3 +24,24 @@ fun SpaceRoom.getAvatarData(size: AvatarSize) = AvatarData(
     url = avatarUrl,
     size = size,
 )
+
+val SpaceRoomVisibility.icon: ImageVector
+    @Composable
+    get() {
+        return when (this) {
+            SpaceRoomVisibility.Private -> CompoundIcons.LockSolid()
+            SpaceRoomVisibility.Public -> CompoundIcons.Public()
+            SpaceRoomVisibility.Restricted -> CompoundIcons.Workspace()
+        }
+    }
+
+val SpaceRoomVisibility.label: String
+    @Composable
+    @ReadOnlyComposable
+    get() {
+        return when (this) {
+            SpaceRoomVisibility.Private -> stringResource(CommonStrings.common_private_space)
+            SpaceRoomVisibility.Public -> stringResource(CommonStrings.common_public_space)
+            SpaceRoomVisibility.Restricted -> stringResource(CommonStrings.common_shared_space)
+        }
+    }
diff --git a/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt b/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt
index f3b38c241a..510a59a7cb 100644
--- a/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt
+++ b/libraries/previewutils/src/main/kotlin/io/element/android/libraries/previewutils/room/SpaceRoomFixture.kt
@@ -16,7 +16,7 @@ import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import io.element.android.libraries.matrix.api.user.MatrixUser
 
 fun aSpaceRoom(
-    name: String? = "Space name",
+    rawName: String? = "Space name",
     avatarUrl: String? = null,
     canonicalAlias: RoomAlias? = null,
     childrenCount: Int = 0,
@@ -29,9 +29,10 @@ fun aSpaceRoom(
     state: CurrentUserMembership? = null,
     topic: String? = null,
     worldReadable: Boolean = false,
+    isDirect: Boolean? = null,
     via: List<String> = emptyList(),
 ) = SpaceRoom(
-    name = name,
+    rawName = rawName,
     avatarUrl = avatarUrl,
     canonicalAlias = canonicalAlias,
     childrenCount = childrenCount,
@@ -45,4 +46,5 @@ fun aSpaceRoom(
     topic = topic,
     worldReadable = worldReadable,
     via = via,
+    isDirect = isDirect
 )
diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml
index 527745898a..9b254127ee 100644
--- a/libraries/ui-strings/src/main/res/values/localazy.xml
+++ b/libraries/ui-strings/src/main/res/values/localazy.xml
@@ -94,6 +94,7 @@
   <string name="action_forgot_password">"Forgot password?"</string>
   <string name="action_forward">"Forward"</string>
   <string name="action_go_back">"Go back"</string>
+  <string name="action_go_to_settings">"Go to settings"</string>
   <string name="action_ignore">"Ignore"</string>
   <string name="action_invite">"Invite"</string>
   <string name="action_invite_friends">"Invite people"</string>
@@ -319,6 +320,7 @@ Reason: %1$s."</string>
   <string name="common_settings">"Settings"</string>
   <string name="common_share_space">"Share space"</string>
   <string name="common_shared_location">"Shared location"</string>
+  <string name="common_shared_space">"Shared space"</string>
   <string name="common_signing_out">"Signing out"</string>
   <string name="common_something_went_wrong">"Something went wrong"</string>
   <string name="common_something_went_wrong_message">"We encountered an issue. Please try again."</string>
@@ -427,6 +429,7 @@ Are you sure you want to continue?"</string>
   <string name="screen_create_poll_remove_accessibility_label">"Remove %1$s"</string>
   <string name="screen_create_poll_settings_section_title">"Settings"</string>
   <string name="screen_labs_enable_threads">"Enable thread replies"</string>
+  <string name="screen_labs_enable_threads_description">"Restarting the app is required to apply changes"</string>
   <string name="screen_labs_header_description">"Try out our latest ideas in development. These features are not finalised; they may be unstable, may change."</string>
   <string name="screen_labs_header_title">"Feeling experimental?"</string>
   <string name="screen_labs_title">"Labs"</string>
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 e574e4911e..8d1a8d9b9f 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:cc1c98131fdad16e22c63feb72536fee912ae84d763c57ff76eaee6d61889b4b
-size 127697
+oid sha256:ec84bcc989b8f80e7e025e6d081dfe64165468f3298c3fb5ccd4a75211a4f7bb
+size 118364
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_1_en.png
index 60ab311cdc..d254ddf882 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a6d3be47ab7d9234657d4d088389c8aadb4d9e073d8c91f4f81dded1b6662a6
-size 42160
+oid sha256:52018347e4361a393b130d1ab479ed96685cacc362b72fd71d46666afef0e6cf
+size 40949
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 41a0545535..6d7c23dadd 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:4ed12d6dc439b7e7d86580ee24a5cd5c3b5e86b13c4f3cf3e64f677632df5872
-size 124816
+oid sha256:49764c59842a7d3ef7ad9c552bb22e1602c273b0b21f4bc0d9ba79b4942bafe3
+size 116100
diff --git a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_1_en.png
index 2b50f7350b..9a8e074a97 100644
--- a/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.home.impl.spaces_HomeSpacesView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3f70a15def31e67e84afe7f9545d280bdbca01c6dd63864662f19976df3bf33
-size 40960
+oid sha256:a96b3cd320587af70dd8dee4e285eb374d04ffc2ce8371a3cb07866f514f32f2
+size 39863
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 0252e8d778..573d02a807 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:cd023c99c75dba5987f86951d46e821d378440a35335dc46894ff127951ee50f
-size 59135
+oid sha256:cd1294f7077b7d1cf6a048ecd3b51d1bb95fbb34df9c21e332dc0a7c75160ee8
+size 54965
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 e142b9451b..a2cce20c03 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:6b9f321dfd59e2a388c0d864c73eca01c29b7f96ee0481597ee3cd8ff1df1781
-size 56262
+oid sha256:e8a8b0b2e6dfae21cf74cbf48f35e4bd52c1951d0ad24fdbb9a7d958b49d68fa
+size 52156
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_9_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_9_en.png
index cc08744b50..593cc05c7a 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Day_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da07e3041ec5814feb0d14e8478d0c817d1496155db2daa612048b94530df20b
-size 38200
+oid sha256:7d0bd66c54a98b59a6b4325735eb34ab9bef7c6807c4fc0e33044ee396e46b14
+size 36344
diff --git a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_9_en.png b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_9_en.png
index 8af0e7e350..5e4e84c276 100644
--- a/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.joinroom.impl_JoinRoomView_Night_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b73e8a2429db6324f471908f46ccd2f6723d59caf4acc738c07d6e402a19285
-size 37752
+oid sha256:029fd9d3e150b6a8d52b4d348ccdbbb661b0009b7065b9530f4e7f168fc6ee78
+size 35965
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_0_en.png
index b952647d5d..65b8867270 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bad1ef12ad0fe54c78eb91b56bf6f5528a25fd0e79cfa38976535d97f179dae2
-size 15999
+oid sha256:1251095a4bb43dc672c23b3b3780288f69a4ce26cd5ee249179e94b8a067d3c1
+size 19183
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_1_en.png
index 55266468a5..0e81c2bfe6 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1ef7cc669d9e180c220aa6e2d7d69a16be61569c98dbb9e81f41e23d6ecaafd
-size 20072
+oid sha256:546ea17f75c5f80282dfa9a021a68eb71e1436b371ff39b399ebe6f7aa5c5121
+size 19216
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_2_en.png
index 3b2e097630..a563c82161 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d5111d6ea6b79a4085b65c5d0390d8bbe8d200cc8e50bd9f3cd568ac9ab6179
-size 53740
+oid sha256:7f58e4f6aa72ef41dd5af1e0d309e3909ea1a7d24875135d0d04dd84a3341be8
+size 19572
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 7b987b6d2c..7bc7c9ebc4 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:377cf0bfc11eb067767b089cc5f35ff92307e3512eb30b6f9d51780acf590f9d
-size 52891
+oid sha256:773eb018763a4f19f494043495a60636b5ef1c5fee5c94df7e2e545287725b06
+size 23111
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
new file mode 100644
index 0000000000..b92c300ce0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db775b9af1c424150eb5682b3f30df88728a4d28ae598aba1c1a22bf44e5d6b0
+size 52677
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_5_en.png
new file mode 100644
index 0000000000..4fc3d6bbdd
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Day_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd2d09be9476f3ff9cb3710e5bbafc0f493f6afc4f77725cb67e23a7fc6f6e13
+size 51864
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_0_en.png
index eb53e9990e..90951be41f 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbe6f27a97a23f24221a89362cd745dedba4ce6de25b93e26117a340b6d565ca
-size 15811
+oid sha256:fb27bf8dbb2323da9c7ff2f3a77ed028e76d5b3ec8e2e95991a12feceb074aae
+size 18816
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_1_en.png
index 66d341ac37..30050d6876 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f5798743a5ee59f6842297439ce338652225d8aa18aebebd3aa1785f06fa4863
-size 19723
+oid sha256:e354f7346a10f75679427774ff96e9b13129b76c8b98944ad4e89b482b110a51
+size 18868
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_2_en.png
index f018c0a4a5..b859185d49 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75d18c001040426b961c5f7d0115a2dbad7e3cd1eb8a7af09357cdda1cc591a4
-size 52470
+oid sha256:d80cd45594d19ecf6e7bf103bb374dd86013bd05e7c10cd3df31e66c2b2cda01
+size 19223
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 dab60e5012..385d518b02 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:26e17ed257ded386bf0538c68f6848841f28d4ffd04a8d3f7d3b41feb203deb2
-size 51517
+oid sha256:7266aeb27353112291ef11d80732eae25ae5c936404af13a99c4572d30bae6a0
+size 22670
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
new file mode 100644
index 0000000000..150431b180
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6701688f5a1b8e59f42bc6e429a561a120576c5d119a3df123d4ee5fc1acb887
+size 51384
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_5_en.png
new file mode 100644
index 0000000000..13c3fcb7ce
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.root_SpaceView_Night_5_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b51e599bbad12e70b116680b00cdd376c921769dbc7b2f918ba9a0919a88847
+size 50509
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_en.png
index 03b2c21087..4c16bb72ca 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderRootView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fec2a25db38f9c65e3fd0218fc5c9937a017b762696dfd7be2906c7cbc28336
-size 19111
+oid sha256:a4e7d8316854658fca2e0edfc22bd844a7972543d0049cd751de31767ee1cc2d
+size 17325
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderRootView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderRootView_Night_0_en.png
index a4dc748f4f..b17f53e338 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderRootView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderRootView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5412ef6dc7306f203649b777cb43ce0ef011e65640e84f14b12dd3198f68b992
-size 18204
+oid sha256:8952a3e1251c854f7b59990ca41cdb11c2ee0f36545e20237057591b5d5cfc58
+size 16481
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderView_Day_0_en.png
index 7a7bf57ab7..7bf24eff1b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderView_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderView_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21acaf9ea606378f5f1e83795e41bec9edc2da05143efba04b70f67cce2c80b0
-size 61626
+oid sha256:7bfe638b75f253649e2d591bf174c9afa176c400e8826ba30f7e1eb50ad9b69e
+size 60450
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderView_Night_0_en.png
index e76102c580..78271cc12e 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderView_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceHeaderView_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e20d4dc80e8f983516cde0361333f941818cade431fb38ae318cfa9a589ab0d8
-size 60846
+oid sha256:f958cae6847bb68aa751cb79d3ceb0c2ea6d112f21a60d8c19633e7008a0e724
+size 59606
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceInfoRow_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceInfoRow_Day_0_en.png
index 7138e2aa39..c5c9ae1eda 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceInfoRow_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceInfoRow_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e4684cfbe7611d6c68879ddd7da5c57aa542b9f8b9250caf5f27009cabaadb2
-size 22353
+oid sha256:b20135fb6973d9d435fe1bfebb654d23ff2e1487b3863387c0843a5df63a6d28
+size 22858
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceInfoRow_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceInfoRow_Night_0_en.png
index 38e9551bc3..59647a9419 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceInfoRow_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceInfoRow_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c7ad1861890262a67664d4e3b3e28d8a5d9ac4556ad029d1d5a387f61ac513f
-size 21275
+oid sha256:3ea661953786398d16100c2209c7549f0dd0798f452947b7f74204319fa4e799
+size 21626
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en.png
index b90c8c5ba1..a6d7438f74 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f6b5eaa4a84fc70cab57d37737b390583d3af9f6e829cecffbcf36351bd40e2
-size 23562
+oid sha256:0145025b77b028a27a4f3dfc9e14a42faa26c55e056464f4b93b2513b16a699d
+size 9027
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 eeafaa0dab..b90c8c5ba1 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:0f271f630d93fdf49436509d08276b6a444db92c06fd06129af93cffbb4623d4
-size 17931
+oid sha256:9f6b5eaa4a84fc70cab57d37737b390583d3af9f6e829cecffbcf36351bd40e2
+size 23562
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 f925a8d461..eeafaa0dab 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:f9fed82716640b4c96b6ef666d9f992e966c17ebddc275c5f562b412e2d549b0
-size 15065
+oid sha256:0f271f630d93fdf49436509d08276b6a444db92c06fd06129af93cffbb4623d4
+size 17931
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en.png
index 8ea41b3e64..450015669c 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:79e7cecc4b03937d2a030721383664d54466e7ce25459c3628ace8b36b305214
-size 35293
+oid sha256:3a35bc50a8834997cf3bfd3884e82297e4f27d95462e23997e1887e8bf782c59
+size 13535
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en.png
index 7b1b324268..770acda2a0 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7798eeef4a1de3312ec69b757963c6430d3952d45db6346961f79dae4e15913a
-size 41389
+oid sha256:ad1cdaac2d2f1e42e3ca1b17c88b7c9a2ead134a7004885a3c3b3dcd41b13ce5
+size 33645
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 7b1b324268..fbc692ffd1 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:7798eeef4a1de3312ec69b757963c6430d3952d45db6346961f79dae4e15913a
-size 41389
+oid sha256:ef19b16146a20517f04e4fa516b2d48af8cacfb5d6f69aacc308656a883765be
+size 39808
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_8_en.png
new file mode 100644
index 0000000000..fbc692ffd1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Day_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ef19b16146a20517f04e4fa516b2d48af8cacfb5d6f69aacc308656a883765be
+size 39808
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en.png
index 5085864cc6..8ea8a0dbe0 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:690df48431acad687f2a2e72aebba4fa63de433ed68b7b9e19818a78973cd211
-size 22676
+oid sha256:f8454b2a9f7959ff981b5fee1b49926d3e22f7255ebadaa15731e494d2416d4c
+size 8930
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 1e85e954f6..5085864cc6 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:34073398379389aa862c892e6eaa33574606071597a0095dfa5c84b99154b5df
-size 17218
+oid sha256:690df48431acad687f2a2e72aebba4fa63de433ed68b7b9e19818a78973cd211
+size 22676
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 45f9f23c79..1e85e954f6 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:13d555688a963f8bf664c8bafc397a48c31575d4a2c2fa06a20b191e620d23ea
-size 14587
+oid sha256:34073398379389aa862c892e6eaa33574606071597a0095dfa5c84b99154b5df
+size 17218
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en.png
index 4c0e5e6671..252a083540 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ac86fef06b52c5456c5eb828c1b60615792906f74d15ea35e3289d2cff47ee1
-size 34183
+oid sha256:1dcdb9795595067c90efd2c3e3d34d740b5c1ed5e02d487c7e03f10f9653c3a7
+size 13134
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en.png
index d2f9e318e8..73e31905c7 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b431eae85dcb3e5efde883a47c78aab6c346429366357bb5f6e740342eeeb97
-size 40072
+oid sha256:cef17e2d54dd9c8eacb9e7d3206fabf9acc91f1d4192bd9e13da0d9356eb536b
+size 32669
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 d2f9e318e8..bf4eb4d4de 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:0b431eae85dcb3e5efde883a47c78aab6c346429366357bb5f6e740342eeeb97
-size 40072
+oid sha256:46fe78468ca13402a6cc78f2420ba72b8c5fe13a442e4e424c68eb74362acccb
+size 38488
diff --git a/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_8_en.png b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_8_en.png
new file mode 100644
index 0000000000..bf4eb4d4de
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/libraries.matrix.ui.components_SpaceRoomItemView_Night_8_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46fe78468ca13402a6cc78f2420ba72b8c5fe13a442e4e424c68eb74362acccb
+size 38488