diff --git a/AccessibilityTests/Sources/GeneratedAccessibilityTests.swift b/AccessibilityTests/Sources/GeneratedAccessibilityTests.swift
index 9dae9ee0d..075607e60 100644
--- a/AccessibilityTests/Sources/GeneratedAccessibilityTests.swift
+++ b/AccessibilityTests/Sources/GeneratedAccessibilityTests.swift
@@ -55,6 +55,10 @@ extension AccessibilityTests {
         try await performAccessibilityAudit(named: "AvatarHeaderView_Previews")
     }
 
+    func testAvatarSettingsButtonLabel() async throws {
+        try await performAccessibilityAudit(named: "AvatarSettingsButtonLabel_Previews")
+    }
+
     func testBadgeLabel() async throws {
         try await performAccessibilityAudit(named: "BadgeLabel_Previews")
     }
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index b978e7534..8dcde6060 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -504,6 +504,7 @@
 		51B3B19FA5F91B455C807BA7 /* RoomPollsHistoryScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E964AF2DFEB31E2B799999F /* RoomPollsHistoryScreenModels.swift */; };
 		522269133E6F65F68482F4F4 /* RemotePreferenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 181CF280BC8E3F335AFCB4B8 /* RemotePreferenceTests.swift */; };
 		52473A4D7B1FBD4CD1E770C8 /* MatrixEntityRegex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AD1A853D605C2146B0DC028 /* MatrixEntityRegex.swift */; };
+		52511848C094F3097F858F00 /* AvatarSettingsButtonLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D3DA6F684A8FD5A70644CDA /* AvatarSettingsButtonLabel.swift */; };
 		5341D48F833E3E30F16FA2A3 /* SeparatorRoomTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2910422CB628D3B2BBE47449 /* SeparatorRoomTimelineView.swift */; };
 		5375902175B2FEA2949D7D74 /* LoginScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CDDDDD9FE1A699D23A5E096 /* LoginScreen.swift */; };
 		53A55748D5F587C9061F98BF /* ServerConfigurationScreenViewStateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 277C20CDD5B64510401B6D0D /* ServerConfigurationScreenViewStateTests.swift */; };
@@ -536,6 +537,7 @@
 		5732395A4F71F51F9C754C5A /* ElementCallService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33AE897D86784CCA5E4E9227 /* ElementCallService.swift */; };
 		5780E444F405AA1304E1C23E /* DeveloperOptionsScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38E521D6C2BF8DF0DFB35146 /* DeveloperOptionsScreen.swift */; };
 		5787613A79C6D553DEA28C5F /* RoomThreadListScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F91AC45CDDF85E946391CA5C /* RoomThreadListScreenViewModel.swift */; };
+		5790B18A7953860715B89A8B /* InverseMask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55BA4D3DFEA16CDD3FE99064 /* InverseMask.swift */; };
 		583A41A4BE76E2E9E0B97881 /* ResolveVerifiedUserSendFailureScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5AEB5907E24092D741718AF /* ResolveVerifiedUserSendFailureScreenCoordinator.swift */; };
 		585DCA0487A0A6F4E59EF5CA /* AnalyticsConsentState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 353024006CB726E9F9187B3A /* AnalyticsConsentState.swift */; };
 		5877255D6E6ED898D402ED8D /* LocationPickerSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 408ACC0D28656F82A5EB6A7E /* LocationPickerSheet.swift */; };
@@ -1932,6 +1934,7 @@
 		2CEBCB9676FCD1D0F13188DD /* StringTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringTests.swift; sourceTree = "<group>"; };
 		2CF9FE7E0CF9F40D1509E63A /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = bg; path = bg.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		2D0946F77B696176E062D037 /* RoomMembersListScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMembersListScreenModels.swift; sourceTree = "<group>"; };
+		2D3DA6F684A8FD5A70644CDA /* AvatarSettingsButtonLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarSettingsButtonLabel.swift; sourceTree = "<group>"; };
 		2D505843AB66822EB91F0DF0 /* TimelineItemProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineItemProxy.swift; sourceTree = "<group>"; };
 		2D7A2C4A3A74F0D2FFE9356A /* MediaPlayerProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaPlayerProviderTests.swift; sourceTree = "<group>"; };
 		2D9DBE1C69F3A60D93B2203F /* Application.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = "<group>"; };
@@ -2156,6 +2159,7 @@
 		5557DDA438841AF5DC003D0B /* SpaceListScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpaceListScreenViewModelTests.swift; sourceTree = "<group>"; };
 		558AA5B376CE8C3982A9557F /* AnalyticsServiceProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsServiceProtocol.swift; sourceTree = "<group>"; };
 		55AEEF8142DF1B59DB40FB93 /* TimelineItemSender.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineItemSender.swift; sourceTree = "<group>"; };
+		55BA4D3DFEA16CDD3FE99064 /* InverseMask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InverseMask.swift; sourceTree = "<group>"; };
 		5644919DB2022397D9D5825A /* MockSoftLogoutScreenState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockSoftLogoutScreenState.swift; sourceTree = "<group>"; };
 		565F1B2B300597C616B37888 /* FullscreenDialog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FullscreenDialog.swift; sourceTree = "<group>"; };
 		56852036214ABA9D7D305768 /* ResolveVerifiedUserSendFailureScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResolveVerifiedUserSendFailureScreenViewModelProtocol.swift; sourceTree = "<group>"; };
@@ -3320,6 +3324,7 @@
 			children = (
 				76A46ABD27628CB5FC402541 /* Backports.swift */,
 				F03AEAA2F66E796C365EFD58 /* ElementNavigationStack.swift */,
+				55BA4D3DFEA16CDD3FE99064 /* InverseMask.swift */,
 				5DB56ABD78E60920ACE43087 /* PreviewScrollView.swift */,
 				D2C513A6CD99E6C3C163DA1E /* RowDivider.swift */,
 				693E16574C6F7F9FA1015A8C /* Search.swift */,
@@ -3921,6 +3926,7 @@
 			children = (
 				8F21ED7205048668BEB44A38 /* AppActivityView.swift */,
 				CC743C7A85E3171BCBF0A653 /* AvatarHeaderView.swift */,
+				2D3DA6F684A8FD5A70644CDA /* AvatarSettingsButtonLabel.swift */,
 				9A028783CFFF861C5E44FFB1 /* BadgeLabel.swift */,
 				C1FA515B3B0D61EF1E907D2D /* BadgeView.swift */,
 				07934EF08BB39353E4A94272 /* BlurEffectView.swift */,
@@ -8322,6 +8328,7 @@
 				F34D06F86C29E219E7132E87 /* AuthenticationStartScreenViewModel.swift in Sources */,
 				0B05A35FF5D1ED9E8A0B41A7 /* AuthenticationStartScreenViewModelProtocol.swift in Sources */,
 				4AAA8606FBA290E23D15422E /* AvatarHeaderView.swift in Sources */,
+				52511848C094F3097F858F00 /* AvatarSettingsButtonLabel.swift in Sources */,
 				1621BF6316FFFEF5AE067C77 /* Avatars.swift in Sources */,
 				42239FD59394A086E046C9BF /* Backports.swift in Sources */,
 				7A25D6926A2C01DB8D0D67A5 /* BadgeLabel.swift in Sources */,
@@ -8558,6 +8565,7 @@
 				B6048166B4AA4CEFEA9B77A6 /* InfoPlistReader.swift in Sources */,
 				BFEB24336DFD5F196E6F3456 /* IntentionalMentions.swift in Sources */,
 				2AAB2A77F1762A2648078A30 /* InteractiveQuickLook.swift in Sources */,
+				5790B18A7953860715B89A8B /* InverseMask.swift in Sources */,
 				4A361E8BAFFA20B9719B47F5 /* InviteUsersConfirmationSheetView.swift in Sources */,
 				C4D2BCAA54E2C62B94B24AF4 /* InviteUsersScreen.swift in Sources */,
 				E27C4D1A1F8BB77CA790B403 /* InviteUsersScreenCoordinator.swift in Sources */,
diff --git a/ElementX/Sources/Other/SwiftUI/InverseMask.swift b/ElementX/Sources/Other/SwiftUI/InverseMask.swift
new file mode 100644
index 000000000..676708aff
--- /dev/null
+++ b/ElementX/Sources/Other/SwiftUI/InverseMask.swift
@@ -0,0 +1,24 @@
+//
+// Copyright 2026 Element Creations Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+// Please see LICENSE files in the repository root for full details.
+//
+
+import SwiftUI
+
+extension View {
+    /// Masks this view using the inverted alpha channel of the given view.
+    ///
+    /// The inverse of `mask(alignment:_:)`.
+    func inverseMask(alignment: Alignment = .center, @ViewBuilder _ inverseMask: () -> some View) -> some View {
+        mask {
+            Rectangle()
+                .overlay(alignment: alignment) {
+                    inverseMask()
+                        .blendMode(.destinationOut) // erases the rectangle wherever `mask` is opaque.
+                }
+                .compositingGroup()
+        }
+    }
+}
diff --git a/ElementX/Sources/Other/SwiftUI/Views/AvatarSettingsButtonLabel.swift b/ElementX/Sources/Other/SwiftUI/Views/AvatarSettingsButtonLabel.swift
new file mode 100644
index 000000000..5714b0294
--- /dev/null
+++ b/ElementX/Sources/Other/SwiftUI/Views/AvatarSettingsButtonLabel.swift
@@ -0,0 +1,86 @@
+//
+// Copyright 2026 Element Creations Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+// Please see LICENSE files in the repository root for full details.
+//
+
+import Compound
+import SwiftUI
+
+struct AvatarSettingsButtonLabel: View {
+    let userProfile: UserProfile
+    var requiresExtraAccountSetup = false
+    let mediaProvider: MediaProviderProtocol?
+    
+    var body: some View {
+        LoadableAvatarImage(url: userProfile.avatarURL,
+                            name: userProfile.displayName,
+                            contentID: userProfile.id,
+                            avatarSize: .user(on: .chats),
+                            mediaProvider: mediaProvider)
+            .accessibilityIdentifier(A11yIdentifiers.homeScreen.userAvatar)
+            .overlayBadge(10, isBadged: requiresExtraAccountSetup)
+            .modifier(StatusEmojiModifier(statusEmoji: userProfile.status.displayed?.emoji))
+            .geometryGroup()
+    }
+}
+
+private struct StatusEmojiModifier: ViewModifier {
+    let statusEmoji: Character?
+    
+    func body(content: Content) -> some View {
+        if let emojiText {
+            content
+                .inverseMask(alignment: .bottomTrailing) {
+                    emojiText
+                        .hidden()
+                        .overlay { Circle().inset(by: -3) }
+                }
+                .overlay(alignment: .bottomTrailing) {
+                    emojiText
+                }
+        } else {
+            content
+        }
+    }
+    
+    var emojiText: (some View)? {
+        statusEmoji.map {
+            Text(String($0))
+                // All values (inc font) scaled by 0.8 as our Liquid Glass avatar is 32pt and not 40pt.
+                .font(.compound.bodyXS)
+                .padding(.vertical, 1) // Match Figma's line height.
+                .alignmentGuide(.trailing) { $0.width - 6.5 }
+                .alignmentGuide(.bottom) { $0.height + 1.5 }
+        }
+    }
+}
+
+struct AvatarSettingsButtonLabel_Previews: PreviewProvider, TestablePreview {
+    static var previews: some View {
+        HStack(spacing: 16) {
+            AvatarSettingsButtonLabel(userProfile: .mockAlice,
+                                      requiresExtraAccountSetup: false,
+                                      mediaProvider: MediaProviderMock(.init()))
+            
+            AvatarSettingsButtonLabel(userProfile: .mockAlice,
+                                      requiresExtraAccountSetup: true,
+                                      mediaProvider: MediaProviderMock(.init()))
+            
+            AvatarSettingsButtonLabel(userProfile: .init(userID: "",
+                                                         avatarURL: .mockMXCUserAvatar,
+                                                         status: .mock(text: "", emoji: "🌴")),
+                                      requiresExtraAccountSetup: false,
+                                      mediaProvider: MediaProviderMock(.init()))
+            
+            AvatarSettingsButtonLabel(userProfile: .init(userID: "",
+                                                         avatarURL: .mockMXCUserAvatar,
+                                                         status: .mock(text: "", emoji: "🌴")),
+                                      requiresExtraAccountSetup: true,
+                                      mediaProvider: MediaProviderMock(.init()))
+        }
+        .padding(16)
+        .previewLayout(.sizeThatFits)
+    }
+}
diff --git a/ElementX/Sources/Other/SwiftUI/Views/BadgeView.swift b/ElementX/Sources/Other/SwiftUI/Views/BadgeView.swift
index 28a08fbc8..bb61e7205 100644
--- a/ElementX/Sources/Other/SwiftUI/Views/BadgeView.swift
+++ b/ElementX/Sources/Other/SwiftUI/Views/BadgeView.swift
@@ -23,21 +23,15 @@ struct BadgeViewModifier: ViewModifier {
     let size: Double
     
     func body(content: Content) -> some View {
-        content.mask {
-            Rectangle()
-                .fill(.white)
-                .overlay(alignment: .topTrailing) {
-                    Circle()
-                        .fill(.black)
-                        .frame(width: maskSize, height: maskSize)
-                        .offset(maskOffset)
-                }
-                .compositingGroup()
-                .luminanceToAlpha()
-        }
-        .overlay(alignment: .topTrailing) {
-            BadgeView(size: size)
-        }
+        content
+            .inverseMask(alignment: .topTrailing) {
+                Circle()
+                    .frame(width: maskSize, height: maskSize)
+                    .offset(maskOffset)
+            }
+            .overlay(alignment: .topTrailing) {
+                BadgeView(size: size)
+            }
     }
     
     private var maskSize: Double {
diff --git a/ElementX/Sources/Other/SwiftUI/Views/JoinedMembersBadgeView.swift b/ElementX/Sources/Other/SwiftUI/Views/JoinedMembersBadgeView.swift
index b8f8e6e48..02a637bc0 100644
--- a/ElementX/Sources/Other/SwiftUI/Views/JoinedMembersBadgeView.swift
+++ b/ElementX/Sources/Other/SwiftUI/Views/JoinedMembersBadgeView.swift
@@ -49,19 +49,12 @@ struct JoinedMembersBadgeView: View {
                                     contentID: hero.id,
                                     avatarSize: .user(on: .spaceHeader),
                                     mediaProvider: mediaProvider)
-                    .mask {
-                        Circle()
-                            .fill(Color.white)
-                            .overlay {
-                                if hero != heroes.first {
-                                    Circle()
-                                        .inset(by: -2)
-                                        .fill(Color.black)
-                                        .offset(x: 12)
-                                }
-                            }
-                            .compositingGroup()
-                            .luminanceToAlpha()
+                    .inverseMask {
+                        if hero != heroes.first {
+                            Circle()
+                                .inset(by: -2)
+                                .offset(x: 12)
+                        }
                     }
             }
         }
diff --git a/ElementX/Sources/Other/SwiftUI/Views/RemoveItemButton.swift b/ElementX/Sources/Other/SwiftUI/Views/RemoveItemButton.swift
index d7e17ff12..a94772420 100644
--- a/ElementX/Sources/Other/SwiftUI/Views/RemoveItemButton.swift
+++ b/ElementX/Sources/Other/SwiftUI/Views/RemoveItemButton.swift
@@ -19,18 +19,12 @@ private struct RemoveItemButtonViewModifier: ViewModifier {
     
     func body(content: Content) -> some View {
         content
-            .mask {
-                Rectangle()
-                    .fill(.white)
-                    .overlay(alignment: .topTrailing) {
-                        closeButtonLabel
-                            .hidden()
-                            .padding(2)
-                            .overlay { Circle().fill(.black) }
-                            .offset(x: 2, y: -2)
-                    }
-                    .compositingGroup()
-                    .luminanceToAlpha()
+            .inverseMask(alignment: .topTrailing) {
+                closeButtonLabel
+                    .hidden()
+                    .padding(2)
+                    .overlay { Circle() }
+                    .offset(x: 2, y: -2)
             }
             .overlay(alignment: .topTrailing) {
                 Button(action: action) {
diff --git a/ElementX/Sources/Other/SwiftUI/Views/RoomAvatarImage.swift b/ElementX/Sources/Other/SwiftUI/Views/RoomAvatarImage.swift
index ef3f800f1..20a6b0aca 100644
--- a/ElementX/Sources/Other/SwiftUI/Views/RoomAvatarImage.swift
+++ b/ElementX/Sources/Other/SwiftUI/Views/RoomAvatarImage.swift
@@ -88,18 +88,11 @@ struct RoomAvatarImage: View {
                                         avatarSize: avatarSize,
                                         mediaProvider: mediaProvider,
                                         onTap: onAvatarTap)
-                        .mask {
-                            Rectangle()
-                                .fill(Color.white)
-                                .overlay {
-                                    Circle()
-                                        .inset(by: -4)
-                                        .fill(Color.black)
-                                        .scaledOffset(x: clusterSize - avatarSize.value,
-                                                      y: -clusterSize + avatarSize.value)
-                                }
-                                .compositingGroup()
-                                .luminanceToAlpha()
+                        .inverseMask {
+                            Circle()
+                                .inset(by: -4)
+                                .scaledOffset(x: clusterSize - avatarSize.value,
+                                              y: -clusterSize + avatarSize.value)
                         }
                         .scaledFrame(size: clusterSize, alignment: .bottomLeading)
                 }
diff --git a/ElementX/Sources/Other/SwiftUI/Views/RoomHeaderView.swift b/ElementX/Sources/Other/SwiftUI/Views/RoomHeaderView.swift
index ceaca8f92..8c48d5622 100644
--- a/ElementX/Sources/Other/SwiftUI/Views/RoomHeaderView.swift
+++ b/ElementX/Sources/Other/SwiftUI/Views/RoomHeaderView.swift
@@ -52,39 +52,42 @@ struct RoomHeaderView: View {
             avatarImage
                 .accessibilityHidden(true)
             
-            HStack(spacing: 4) {
-                VStack(alignment: .leading, spacing: 0) {
-                    HStack(spacing: 8) {
-                        Text(roomName)
-                            .lineLimit(1)
-                            .font(.compound.bodyMDSemibold)
-                            .foregroundStyle(.compound.textPrimary)
-                            .accessibilityIdentifier(A11yIdentifiers.roomScreen.name)
-                        
-                        if let statusEmoji = dmRecipientDetails.statusEmoji {
-                            Text(String(statusEmoji))
-                                .font(.compound.bodyLG)
-                                .foregroundStyle(.compound.textPrimary)
-                        }
-                    }
-                    
-                    if let roomSubtitle {
-                        Text(roomSubtitle)
-                            .lineLimit(1)
-                            .font(.compound.bodyXS)
-                            .foregroundStyle(.compound.textSecondary)
-                    }
-                }
+            VStack(alignment: .leading, spacing: 0) {
+                roomDetails
                 
-                if let verificationState = dmRecipientDetails.verification {
-                    VerificationBadge(verificationState: verificationState, size: .xSmall, relativeTo: .compound.bodyMDSemibold)
+                if let roomSubtitle {
+                    Text(roomSubtitle)
+                        .lineLimit(1)
+                        .font(.compound.bodyXS)
+                        .foregroundStyle(.compound.textSecondary)
                 }
+            }
+        }
+    }
+    
+    private var roomDetails: some View {
+        HStack(spacing: 4) {
+            HStack(spacing: 8) {
+                Text(roomName)
+                    .lineLimit(1)
+                    .font(.compound.bodyMDSemibold)
+                    .foregroundStyle(.compound.textPrimary)
+                    .accessibilityIdentifier(A11yIdentifiers.roomScreen.name)
                 
-                if let historySharingIcon {
-                    CompoundIcon(historySharingIcon, size: .xSmall, relativeTo: .compound.bodyMDSemibold)
-                        .foregroundStyle(.compound.iconInfoPrimary)
+                if let statusEmoji = dmRecipientDetails.statusEmoji {
+                    Text(String(statusEmoji))
+                        .font(.compound.bodyLG)
+                        .foregroundStyle(.compound.textPrimary)
                 }
             }
+            if let verificationState = dmRecipientDetails.verification {
+                VerificationBadge(verificationState: verificationState, size: .xSmall, relativeTo: .compound.bodyMDSemibold)
+            }
+            
+            if let historySharingIcon {
+                CompoundIcon(historySharingIcon, size: .xSmall, relativeTo: .compound.bodyMDSemibold)
+                    .foregroundStyle(.compound.iconInfoPrimary)
+            }
         }
     }
     
diff --git a/ElementX/Sources/Other/TestablePreview/TestablePreviewsDictionary.swift b/ElementX/Sources/Other/TestablePreview/TestablePreviewsDictionary.swift
index 89dfedd2a..da5a18f6e 100644
--- a/ElementX/Sources/Other/TestablePreview/TestablePreviewsDictionary.swift
+++ b/ElementX/Sources/Other/TestablePreview/TestablePreviewsDictionary.swift
@@ -22,6 +22,7 @@ enum TestablePreviewsDictionary {
             "AuthenticationClassicAppBackupInstructionsView_Previews" : AuthenticationClassicAppBackupInstructionsView_Previews.self,
             "AuthenticationStartScreen_Previews" : AuthenticationStartScreen_Previews.self,
             "AvatarHeaderView_Previews" : AvatarHeaderView_Previews.self,
+            "AvatarSettingsButtonLabel_Previews" : AvatarSettingsButtonLabel_Previews.self,
             "BadgeLabel_Previews" : BadgeLabel_Previews.self,
             "BlockedUsersScreen_Previews" : BlockedUsersScreen_Previews.self,
             "BloomModifier_Previews" : BloomModifier_Previews.self,
diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
index 77acb92d1..c31770a3a 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
@@ -85,15 +85,9 @@ struct HomeScreen: View {
         Button {
             context.send(viewAction: .showSettings)
         } label: {
-            LoadableAvatarImage(url: context.viewState.userProfile.avatarURL,
-                                name: context.viewState.userProfile.displayName,
-                                contentID: context.viewState.userProfile.id,
-                                avatarSize: .user(on: .chats),
-                                mediaProvider: context.mediaProvider)
-                .accessibilityIdentifier(A11yIdentifiers.homeScreen.userAvatar)
-                .clipShape(.circle)
-                .overlayBadge(10, isBadged: context.viewState.requiresExtraAccountSetup)
-                .compositingGroup()
+            AvatarSettingsButtonLabel(userProfile: context.viewState.userProfile,
+                                      requiresExtraAccountSetup: context.viewState.requiresExtraAccountSetup,
+                                      mediaProvider: context.mediaProvider)
         }
         .accessibilityLabel(L10n.commonSettings)
     }
diff --git a/ElementX/Sources/Screens/Spaces/SpacesScreen/View/SpacesScreen.swift b/ElementX/Sources/Screens/Spaces/SpacesScreen/View/SpacesScreen.swift
index f0e46d1e2..7f2d3ab53 100644
--- a/ElementX/Sources/Screens/Spaces/SpacesScreen/View/SpacesScreen.swift
+++ b/ElementX/Sources/Screens/Spaces/SpacesScreen/View/SpacesScreen.swift
@@ -96,13 +96,8 @@ struct SpacesScreen: View {
             Button {
                 context.send(viewAction: .showSettings)
             } label: {
-                LoadableAvatarImage(url: context.viewState.userProfile.avatarURL,
-                                    name: context.viewState.userProfile.displayName,
-                                    contentID: context.viewState.userProfile.id,
-                                    avatarSize: .user(on: .spaces),
-                                    mediaProvider: context.mediaProvider)
-                    .accessibilityIdentifier(A11yIdentifiers.homeScreen.userAvatar)
-                    .compositingGroup()
+                AvatarSettingsButtonLabel(userProfile: context.viewState.userProfile,
+                                          mediaProvider: context.mediaProvider)
             }
             .buttonStyle(.borderless)
             .accessibilityLabel(L10n.commonSettings)
diff --git a/PreviewTests/Sources/GeneratedPreviewTests.swift b/PreviewTests/Sources/GeneratedPreviewTests.swift
index 3b0e9e419..398781aea 100644
--- a/PreviewTests/Sources/GeneratedPreviewTests.swift
+++ b/PreviewTests/Sources/GeneratedPreviewTests.swift
@@ -95,6 +95,13 @@ extension PreviewTests {
         }
     }
 
+    @Test
+    func avatarSettingsButtonLabel() async throws {
+        for (index, preview) in AvatarSettingsButtonLabel_Previews._allPreviews.enumerated() {
+            try await assertSnapshots(matching: preview, step: index)
+        }
+    }
+
     @Test
     func badgeLabel() async throws {
         for (index, preview) in BadgeLabel_Previews._allPreviews.enumerated() {
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.DM-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.DM-iPad-en-GB.png
index da2df0651..e9e23e016 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.DM-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.DM-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:819b04c7c74543b6e46c81dcdece3055512e2c00d0bbb3f3c30d0e506de3f679
-size 155242
+oid sha256:e9ba473af38b195bfa8a38a232e736872cd5b7809e89a4ddca4d90314b0b6a0a
+size 149727
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.DM-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.DM-iPad-pseudo.png
index 34301f1df..7240a9c05 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.DM-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.DM-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f81546203d4732a051c94517abcd6b3f405562431caa17b429b0266d9b74af65
-size 155772
+oid sha256:1eef1a5ff539c5a9bcc7e8c2aada12dd76b3f913edea4fcb278a782ab3d79408
+size 150315
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.DM-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.DM-iPhone-en-GB.png
index 8055c25f8..02164a625 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.DM-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.DM-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03c79be492f2314f2e6747646dd277cf030604ecb91eea6642ce3738b65a3151
-size 99796
+oid sha256:92f10793d85567b9504139687d6fac8ff7610ac1fd1921ba126c7009f6ef326f
+size 94558
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.DM-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.DM-iPhone-pseudo.png
index 61fa102de..071a906fc 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.DM-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarHeaderView.DM-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:541db17500644afe024716f675e0e4fc0ee4dc4a2c40f1fd402b78844f15f68b
-size 101383
+oid sha256:779a8dfd1f4c0ec9e8af7605cfc1b5fff0d3560eb3c36956f15b7d271fbfdab4
+size 96244
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarSettingsButtonLabel.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarSettingsButtonLabel.iPad-en-GB-0.png
new file mode 100644
index 000000000..6ec14654f
--- /dev/null
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarSettingsButtonLabel.iPad-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:918f6cb4e15876a84893fe1db1a5102540a37b272fcadc58fe8119e3aa4ca037
+size 21295
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarSettingsButtonLabel.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarSettingsButtonLabel.iPad-pseudo-0.png
new file mode 100644
index 000000000..6ec14654f
--- /dev/null
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarSettingsButtonLabel.iPad-pseudo-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:918f6cb4e15876a84893fe1db1a5102540a37b272fcadc58fe8119e3aa4ca037
+size 21295
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarSettingsButtonLabel.iPhone-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarSettingsButtonLabel.iPhone-en-GB-0.png
new file mode 100644
index 000000000..f0e26ac67
--- /dev/null
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarSettingsButtonLabel.iPhone-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d355015973683e5a0260679f724c979ef2f070245bec6fd302c3c46b58591ff
+size 17368
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarSettingsButtonLabel.iPhone-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarSettingsButtonLabel.iPhone-pseudo-0.png
new file mode 100644
index 000000000..f0e26ac67
--- /dev/null
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/avatarSettingsButtonLabel.iPhone-pseudo-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d355015973683e5a0260679f724c979ef2f070245bec6fd302c3c46b58591ff
+size 17368
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/inviteUsersScreenSelectedItem.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/inviteUsersScreenSelectedItem.iPad-en-GB-0.png
index 2272cd2c0..99165e556 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/inviteUsersScreenSelectedItem.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/inviteUsersScreenSelectedItem.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e70cdfe8f7b3ed2d33f2148a459fa2facd2a3cf3b00a8538d60487c9f6b2f85
-size 80350
+oid sha256:0164c8fe499ae9a1721fa26466de6420b0e36801abec7d82fe943cf137d0bd41
+size 80426
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/inviteUsersScreenSelectedItem.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/inviteUsersScreenSelectedItem.iPad-pseudo-0.png
index 2272cd2c0..99165e556 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/inviteUsersScreenSelectedItem.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/inviteUsersScreenSelectedItem.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e70cdfe8f7b3ed2d33f2148a459fa2facd2a3cf3b00a8538d60487c9f6b2f85
-size 80350
+oid sha256:0164c8fe499ae9a1721fa26466de6420b0e36801abec7d82fe943cf137d0bd41
+size 80426
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/inviteUsersScreenSelectedItem.iPhone-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/inviteUsersScreenSelectedItem.iPhone-en-GB-0.png
index f26401a67..e6c53cf61 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/inviteUsersScreenSelectedItem.iPhone-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/inviteUsersScreenSelectedItem.iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec01a9dc61c2512e8ca0dcec79eb597dfad6ed090c5381ed187523cb39dbeacc
-size 38752
+oid sha256:950d80b6d67b0689890d0bf1e23ffdd7d0244ef461c76facc4543d8b7f7889ac
+size 38810
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/inviteUsersScreenSelectedItem.iPhone-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/inviteUsersScreenSelectedItem.iPhone-pseudo-0.png
index f26401a67..e6c53cf61 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/inviteUsersScreenSelectedItem.iPhone-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/inviteUsersScreenSelectedItem.iPhone-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec01a9dc61c2512e8ca0dcec79eb597dfad6ed090c5381ed187523cb39dbeacc
-size 38752
+oid sha256:950d80b6d67b0689890d0bf1e23ffdd7d0244ef461c76facc4543d8b7f7889ac
+size 38810
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPad-en-GB.png
index 332fc4bd4..98f33662d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04e39c16413f2fee23bb22f42675c969ecf687114010d2118f1c9ae2f1fe8a3e
-size 156233
+oid sha256:874d6b8d83c6913c22e3155d111c39d2a1d97ac537b0200809a394d21f121112
+size 156385
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPad-pseudo.png
index 60ef94c4e..6a936c65b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f213c72ea4683ab3fcf4fb4934d2109492da0388a43056129fe4fc5f6d48023b
-size 159551
+oid sha256:e723024f137cb17afd92487595a26b51ff76807cbbaac28fee048d9317d532e4
+size 159715
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPhone-en-GB.png
index dd40a4bca..3dcd8821b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c8d015786f51e3580634d63adf0e58e83821a85928dd0802e59d71cd4890b0f
-size 102820
+oid sha256:083537e2d0109e33a94b6c1637e1016a2423c30b1c1927aad42cf81bb2a3a83a
+size 102912
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPhone-pseudo.png
index 500f893c8..9087362ab 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Banned-Space-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b4a5e19a2f79e6b0c94df3dcc47a0ef4f9b0399199144b7557e5f12d81ea5f0
-size 105928
+oid sha256:9eb244b2fa841d0d487a1f32cd19c408c7391553d323878b703977a938e9e1e6
+size 106009
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPad-en-GB.png
index 759a9ac50..d3d753872 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32d281a1cf15e0b910dbc6fc39b28583566bad8eae079f35f2cbc4d7643d4e69
-size 165666
+oid sha256:f9b36a98d81c5fc53a6cfaac3173a27b620c37bdf318729f93ba61022a2edf70
+size 165818
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPad-pseudo.png
index bfb4d4cfe..088786594 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e64460ba7c923ea99c2441b7f61e0231a71b69f41178b7ee7ac783d9551f2dd8
-size 180911
+oid sha256:92628be462c2bc749aaa1eb9c31a2b917993a7ea53480b15211f0e9d58c1e2af
+size 181075
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPhone-en-GB.png
index 0b0763e95..a63b514c0 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:112bb6287ba54edbbaa06e607141bc3ee44bba91208cfc7c9eafb66c21d1a88c
-size 113731
+oid sha256:74f9ab217ccffc59c82bd9da99ec3f32c7cecfbb8694a8ef76a2447397f1cd13
+size 113823
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPhone-pseudo.png
index 466d4598f..5f0e488db 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Forbidden-Space-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:afb4c90b2beb3a01ad5ce8a5d818f32cb0414493bf644016c8503fffffb61aa5
-size 130481
+oid sha256:8178fd63fbcce35aeff1faac7148289a82447edf584ddb1eb21607f8336b51bf
+size 130562
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPad-en-GB.png
index 3f1ded8c5..25f82d1c7 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f238bf3ba1c3f14b8c18b14cd451c99a14e2dc50e853b0caf3f15d4e2edba9cc
-size 153164
+oid sha256:92d0c3f837a3d51569293ca73be22628cabcd1b3c6f357697a68a055d92d6420
+size 153316
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPad-pseudo.png
index 92ca0b334..f6bc06c31 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68d27367684b10a4c8210f5714fc110fa0c51cddcea20fda88ae0f056a28d08b
-size 157581
+oid sha256:463755fdd7b313a88afc43fc941f8dac801ce0e3b821bae8983ad37acd534ca2
+size 157745
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPhone-en-GB.png
index 52b3293ba..9cfebdaf0 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39b34a68697049cf22a95d867da0a720f6018e1d5b01795cfc8e129052586733
-size 100078
+oid sha256:ca7ca8d9f4f72fa4c024f6623c4b06539f19c37bbbd920f6cbddea7654e75e3a
+size 100170
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPhone-pseudo.png
index 72840d0cb..ea0101b39 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InviteRequired-Space-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f6728df9cb8520d58b58ee06712e7ca93154b95debde0e4c92985b8662dbe17c
-size 107735
+oid sha256:5d1d0072b9003340fdb7ab5b8ed238d8f182e72b8220b8acb9562cbcf75d446b
+size 107816
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPad-en-GB.png
index 47c83cf83..d1548c23e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ae635c0da1a2ba7ee9f3bd4aaf5ea90ecac2400008db1076e744ec171bf7147
-size 195633
+oid sha256:ff6f85b922dbede778f8867599b59d9c6d8e5ea2b5a1582320a199ac9be19d0b
+size 195778
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPad-pseudo.png
index a6aebb56c..567fef920 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d64c6d91e9d96a7cf1ef767ae5c25a049244e2fd59b7c1479f1b419ba3578bf
-size 203271
+oid sha256:53ccf4cfb951d58278c02548b78639f76c1e42f63142844ad526d26a5ee70ae4
+size 203422
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPhone-en-GB.png
index 365d846c1..07582b8ec 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d3c2e80c849541cf481ada9a99377d50aa0de6f8a4356c90c1f89d7553218e1
-size 140309
+oid sha256:db53a630186c4209958f52748be7f8344c1a81ccfd9957e7aaa7e3987331690b
+size 140400
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPhone-pseudo.png
index 5506649e3..d6f96b401 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Invited-Space-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ae4821c2d6df4d0761ae3e917e5952a9e4d6e9552c96d89bcd2028ad85bbd13
-size 147128
+oid sha256:16a5839b7d49c5c8a5fd0c0f19ed0b5c9223bb215fd17e0813f1e9400bca5148
+size 147211
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPad-en-GB.png
index f27818c2f..e42378d6f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7816a85882e6cdca43d820dfe7c80b33abfdf48dbad9f4a3de98112c32546574
-size 137564
+oid sha256:16ff4d96240d27911cbad826f4ee95911a343eae1c80ba8d871daf516c362de2
+size 137703
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPad-pseudo.png
index d126c0904..7d6d85bf5 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4301af38a67bd5783e4ebded8a07b84684e82c116a9e8a2033b7e388b0930781
-size 145074
+oid sha256:b989886b787dc83b49d61f827ff6f171307f131df1edff2ec2405005205c2011
+size 145234
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPhone-en-GB.png
index 0468a4092..eeb681ed9 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52ee9eec0b20518cf1ae8cd37bc6343f02ad76c927f644162bf1c5d29370175e
-size 83927
+oid sha256:34180a1d5f5373e418437f6f18750d8fe500a2c70db986092246d56b539c4221
+size 84040
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPhone-pseudo.png
index 6b8fc1cb0..a3746490e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.InvitedWithHiddenAvatars-Space-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38f8a74b377bc33215d9b2928de036f461f7f3622118c1697ad38767e916785b
-size 90585
+oid sha256:af30ce8c34a1d39101bcb4a274331608b1620c08b54f91dc3925211c762731db
+size 90701
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPad-en-GB.png
index bfc6ca009..f0afeb17b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11db383cc82c8d99138e981ffd4a01d7145ffbe6644d7932c7d104b6dada5df0
-size 153791
+oid sha256:d5c5e628ba6958fb639247c1f79e798f7e4669b8ce7285963e6f55c06647cf47
+size 153944
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPad-pseudo.png
index b5c58881e..564356a8b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c0f4c21ecc0d351bf7472a879de20c028110aba930ab4a36da5e3134fb678a10
-size 158091
+oid sha256:5e6e762571e037e6e55550b5b093aeedbc2d6e7801c822c70c676498954c7d70
+size 158247
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPhone-en-GB.png
index 92a33bf96..73cad305c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ed9926059534bb5fb0a49ce2a3aeb6695e918a8d984053085f7d962c39f1055
-size 99762
+oid sha256:9dfbd50f2d81f6e85b316379a3c05a9eac44d128ca891571b5c80475c53456b5
+size 99858
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPhone-pseudo.png
index f3e283ec0..97319f921 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Joinable-Space-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:729648f22799603cedbe60b99509ff07f66968d08c1b96fbb69e172a1b9b0ebf
-size 103740
+oid sha256:37f5b4857eb3fd10c9f76b3c534634a78e8a128e04f4848e1ce6d22d3f7c45af
+size 103824
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPad-en-GB.png
index f1f6cd75c..4d272ed95 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c904ca40f47e3b920de3c3ba88623934d63e958c6dd78155b9649d1d350500bd
-size 168343
+oid sha256:4ddb6c349f17106c9bfc6c04eb86bac814241a523f150d34ed1825b1486a323f
+size 168500
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPad-pseudo.png
index 18d418f76..ecbe2e732 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:72a8afd713cbeab2f6806f8e0f4bfed710ee681747bc8a706aed2e92044a39c5
-size 174627
+oid sha256:ca865586b2ba3892f28c2cf8f29ea35b75393e2063aba80c6987f99c105fecf2
+size 174784
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPhone-en-GB.png
index 5d60c47e8..5fb015cee 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34d6537a603900a6e2233b1a2fcc483d0e24b801ce3e6e0d8906567c5f75865d
-size 112290
+oid sha256:c9f847d1a07ad51732783d82c3d7b796a6406f9875dbe0bc8ddd1aab98b138ad
+size 112379
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPhone-pseudo.png
index bcdba07b4..344f021df 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Knockable-Space-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf48ec4ef46c978b08c598212956b7f213e13d969432868b86313621854ffa26
-size 122120
+oid sha256:51422df85b341c5697318d33b5038d4f963714d5fb5c3759e776d492f61189e4
+size 122199
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPad-en-GB.png
index 8032c7478..dd88a50a5 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8584b9881fbf7192e71871758e3a9611a4d27aa5c8b0e8681e5516892c0df9f5
-size 169195
+oid sha256:b67e592690ecad0d720c45e6831a1dbc2bc3ba66cc79e43b18dd82582295c2b1
+size 169351
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPad-pseudo.png
index f03e2b9c3..f264921f6 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7776a0b9933a77540f75035d8dd8b32e1ddb1b16f5b009c31cfcc11f1e846ae5
-size 184901
+oid sha256:ed727f30041e184ce32d99a80f8db7a3e9b96e578016ef54aac83a547888d6ec
+size 185051
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPhone-en-GB.png
index c1a8d38a1..ee0524434 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c87770052c2a3159f2f7db7d73678abba21a346da57d8ca9a1cac3e9fe3ef6c4
-size 116964
+oid sha256:eb494bea70c990bd29ad828f51f7aade33f6287339d6d80da76661879f25d6fc
+size 117050
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPhone-pseudo.png
index fbccc39c8..63166239e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.Restricted-Space-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56955889f1a7a65d10edca2bf3c516b15b756150feef217c481b997d255bac01
-size 134388
+oid sha256:683c8435428e09932f4df65010afef084c5275411577bff47ac81f04bc5ea041
+size 134452
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPad-en-GB.png
index 0c1f1c4c6..9fe3f393f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3936084a9283840a9cc9626e24e3295047d7c18296c9d212a68af22a591c0c3
-size 154109
+oid sha256:842f841d4008c1b22fcce0e8d484d08d58a7898b5b2d53fcda1b7fafe562ade7
+size 154265
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPad-pseudo.png
index 8994c3f77..9a109f96a 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7433d4aae2bc69123e04bebef67adf38a1a9b99a55341d252e81e7b5461e04c4
-size 158348
+oid sha256:3c3be1fbef95900bec47405e954b20c41b3510662b42352367c355be635e4d2a
+size 158498
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPhone-en-GB.png
index 47535b2e2..891d293b0 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c1e921864d5fd2df68dcc2d6181b20d38de97ea9b496367db0f68a26e814e32
-size 100154
+oid sha256:6afa36046af897700472ada1d622bae6f4896732858ec5d06b29eb719ad0a557
+size 100240
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPhone-pseudo.png
index a57a4296e..afff67da6 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinRoomScreenSpace.RestrictedJoinable-Space-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae16b56b152296f6b9f4d919e2fffd76a0a1644376f95378f1095701f454197b
-size 104044
+oid sha256:0e291deaede4b59a670cd3401fe1a8c98f96e9fbe5920226b7e15680928ea9b5
+size 104108
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinedMembersBadgeView.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinedMembersBadgeView.iPad-en-GB-0.png
index a4560f06e..6c5138630 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinedMembersBadgeView.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinedMembersBadgeView.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c079081867fb1aa64794830c1eb2a9fb30e247536db074d8fb203b5b86c2a82b
-size 74274
+oid sha256:cfd3110c82a02232eac3ab9fcb9cabe38f7b1630d31b5766d36d3a1c1ccdf23d
+size 74165
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinedMembersBadgeView.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinedMembersBadgeView.iPad-pseudo-0.png
index 579f0794c..575140646 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinedMembersBadgeView.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinedMembersBadgeView.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f2e977b3cb10357020dd8f2470bc0da48f83794447cf701e22b1c6c198cd897
-size 75496
+oid sha256:866d140ab3dfe3f50599cd3b6ecd1396080122bd138ec175c82a83bb61b103cd
+size 75442
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinedMembersBadgeView.iPhone-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinedMembersBadgeView.iPhone-en-GB-0.png
index 720a3f9ee..341637018 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinedMembersBadgeView.iPhone-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinedMembersBadgeView.iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4e0f9d529fb93fcb265b9d32f73a54b6590960e3fd34f016ff5daa917c90a63
-size 33300
+oid sha256:d795c71d68223f55bf1578a91bf6cee14d39cd50bddbb3edb10aea21517d5886
+size 33414
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinedMembersBadgeView.iPhone-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinedMembersBadgeView.iPhone-pseudo-0.png
index 2af4aa893..b26fafda8 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/joinedMembersBadgeView.iPhone-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/joinedMembersBadgeView.iPhone-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c49cdbcaa1ec358a5464c8c2ec63b7083584d89b4a0c1106941dfa9ffe931266
-size 34817
+oid sha256:9483293d72fbb86969f92501760df4d578cf4e8dd5db170eda739b9d1659d95f
+size 34910
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomAvatarImage.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomAvatarImage.iPad-en-GB-0.png
index df1f1541f..8eddaf73c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomAvatarImage.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomAvatarImage.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54c777a79aaa97385b243b50bb51c0a79f1c0ccdf6c017dac3d7761f7cf566b0
-size 134969
+oid sha256:825f1ad000d81fd402f67bad84423fb753845e707c44ddf2ee18a83a7735bfad
+size 135089
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomAvatarImage.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomAvatarImage.iPad-pseudo-0.png
index df1f1541f..8eddaf73c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomAvatarImage.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomAvatarImage.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54c777a79aaa97385b243b50bb51c0a79f1c0ccdf6c017dac3d7761f7cf566b0
-size 134969
+oid sha256:825f1ad000d81fd402f67bad84423fb753845e707c44ddf2ee18a83a7735bfad
+size 135089
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomAvatarImage.iPhone-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomAvatarImage.iPhone-en-GB-0.png
index 70defaa6a..bc389a793 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomAvatarImage.iPhone-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomAvatarImage.iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5e0f70279233b5df282bafc099a22277a867bac6c59f93b65661a9e4614aa3a
-size 88008
+oid sha256:d3e1c156dec56070376d90e77ba12b7db51626a8f7202ab83ae92911da90f130
+size 88299
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomAvatarImage.iPhone-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomAvatarImage.iPhone-pseudo-0.png
index 70defaa6a..bc389a793 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomAvatarImage.iPhone-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomAvatarImage.iPhone-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5e0f70279233b5df282bafc099a22277a867bac6c59f93b65661a9e4614aa3a
-size 88008
+oid sha256:d3e1c156dec56070376d90e77ba12b7db51626a8f7202ab83ae92911da90f130
+size 88299
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPad-en-GB.png
index dc1a8d460..2dd1fd9fe 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85bfe24aec8b8a5a6a39e3c7e010681f0ff80d96298d9f6d4e6d3aeae019766c
-size 217413
+oid sha256:00660a19b78a7e0a00a9d570214390236593aa65beb52a7896e399a64c5f5098
+size 217701
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPad-pseudo.png
index e99c78739..8b996e09f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4eded84912a1eb3d934f614dcf2c5364378bf60c20e225708f0b2c047aa0d084
-size 230860
+oid sha256:95d5e83b58596006ef7ca7665e2538a8d3597c4ec68f8ab1f7faa5478c89d3fe
+size 231142
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPhone-en-GB.png
index 58aeff1dc..ffaaae686 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ff6ec8c7b063be8de4c59a8b8cd55e34a6c773dd3ac292b60ae45f561446e80
-size 156939
+oid sha256:8f9145be8bd4607f423f3cb8cf2ecc0fcab50ae5850cac36c327ae42782a8c7a
+size 157117
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPhone-pseudo.png
index fabc11287..a87f03e5e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57c5b08473f8a493200bcefc1bf4c1a6aab7a411bc9f8ea509e2c2617f4d87e7
-size 167483
+oid sha256:37012fcd9b54e2e1221a96fe1fc66bdec4d5c960ac83160c6c1f9aac93b411c9
+size 167694
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Moderators-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Moderators-iPad-en-GB.png
index a6683594b..51e153442 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Moderators-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Moderators-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5280e7cf8527fa4737ae39b4b4b642caf00eac0ecba48bbd9599fdf71662892a
-size 226776
+oid sha256:2b188c0f004a9fdbfc8ebe5d96400a04647384f37f4194dff8678f2487033bfe
+size 226962
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Moderators-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Moderators-iPad-pseudo.png
index 9b2849ff0..9a809a7ec 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Moderators-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Moderators-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6da7005206a2a5337280b6d4f7f4420aaa6ed93f92853e7be17357c7bce4d0ce
-size 243776
+oid sha256:6eb0f90374dc2f3ec87ea09bfa73af8c6655fded1de52a60cff9b7d7d69820b4
+size 243961
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPad-en-GB.png
index 345c0a8e8..630b377d5 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2c08d051ae2a8b25f32e1f8b78f1165d8552670f1b816606ff9695e0572a5e3
-size 206295
+oid sha256:4377ad13da7cd28772d62983387db9cb7ce07e55fcb399502b4925f579387b81
+size 206458
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPad-pseudo.png
index 504fcd9e4..c8a502466 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c6d2c45d3a0bbf3efb75c9cf4e67a4118f424192bfb00a0527f47d548a39e3e
-size 215066
+oid sha256:9e307cce78401f0f1514d7b83f4ebe52872d179cfac0ff0fe9d65611a9891ecd
+size 215198
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPhone-en-GB.png
index dd10091ff..468c05d94 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a9421e0dac6286b41805b5a5b5fcbe5c291bdc2c90c3df000a7b5fc7ba1016f
-size 150448
+oid sha256:8345233b43a2f78f5d4900d76355d9fe795cefec7329144d87f097d2d135c2f3
+size 150565
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPhone-pseudo.png
index db5426491..5e7a5f2f2 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec539cd6752485ceeb987779191f80cd503c981d3b5756ca256c3c759d28c25b
-size 158614
+oid sha256:36b31b988f705f3f0a4773345d575747f9cf06e6589ddc80a85abe7c8fa32991
+size 158732
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenSelectedItem.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenSelectedItem.iPad-en-GB-0.png
index d22402410..3362a5e19 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenSelectedItem.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenSelectedItem.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f768bd720b60ace15fd9b1c4cbda91a28c36e7b54686115703ddf0e155b929f
-size 62856
+oid sha256:77b62d58ec3143a0d4cfc3e3130941cc6436add8befabfe85915a1a80b2b349c
+size 62305
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenSelectedItem.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenSelectedItem.iPad-pseudo-0.png
index d22402410..3362a5e19 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenSelectedItem.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenSelectedItem.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f768bd720b60ace15fd9b1c4cbda91a28c36e7b54686115703ddf0e155b929f
-size 62856
+oid sha256:77b62d58ec3143a0d4cfc3e3130941cc6436add8befabfe85915a1a80b2b349c
+size 62305
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenSelectedItem.iPhone-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenSelectedItem.iPhone-en-GB-0.png
index 2eaf456bd..8b1d51142 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenSelectedItem.iPhone-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenSelectedItem.iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:595d9ab38cc6bc77534a7ee79753333da84e0ad6ea99772e56b192c7866cfd1e
-size 52445
+oid sha256:d2529cfa821eadcb5b8b46fa2cb348ddd87d6e1f397f812300351953c173994d
+size 52041
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenSelectedItem.iPhone-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenSelectedItem.iPhone-pseudo-0.png
index 2eaf456bd..8b1d51142 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenSelectedItem.iPhone-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenSelectedItem.iPhone-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:595d9ab38cc6bc77534a7ee79753333da84e0ad6ea99772e56b192c7866cfd1e
-size 52445
+oid sha256:d2529cfa821eadcb5b8b46fa2cb348ddd87d6e1f397f812300351953c173994d
+size 52041
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPad-en-GB-0.png
index f84e02a17..c008ab884 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b69868496c6b23bf90e591cc47f8d77c7bafa4df664cc348239b232febebd709
-size 268737
+oid sha256:ef77d7430ca9dbdd52f54eadd99c003213ca61e1efd3128ba5c8701ce1839e1c
+size 268740
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPad-pseudo-0.png
index f84e02a17..c008ab884 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b69868496c6b23bf90e591cc47f8d77c7bafa4df664cc348239b232febebd709
-size 268737
+oid sha256:ef77d7430ca9dbdd52f54eadd99c003213ca61e1efd3128ba5c8701ce1839e1c
+size 268740
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPhone-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPhone-en-GB-0.png
index 85b2b3757..481e5d244 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPhone-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bba1b10b2461e388a41e701669cef7115a6ae5c197d5f1d2428b7657829787b1
-size 217634
+oid sha256:30e0ebf8881e2855560bfef5eb63d6c3010a3bf79021ac0093cdde4ec97c1164
+size 217570
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPhone-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPhone-pseudo-0.png
index 85b2b3757..481e5d244 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPhone-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPhone-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bba1b10b2461e388a41e701669cef7115a6ae5c197d5f1d2428b7657829787b1
-size 217634
+oid sha256:30e0ebf8881e2855560bfef5eb63d6c3010a3bf79021ac0093cdde4ec97c1164
+size 217570
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceAddRoomsScreenSelectedItem.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceAddRoomsScreenSelectedItem.iPad-en-GB-0.png
index f9ed58886..14bead8d2 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceAddRoomsScreenSelectedItem.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceAddRoomsScreenSelectedItem.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c70a09120ce3dc01107896ec70d0e076f1d0b901a40937952c352bdfe565f04
-size 93873
+oid sha256:a284c90d735b87701d3befd429d4919ac04c01c9b17fe4edffab9c74a9969d3f
+size 93676
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceAddRoomsScreenSelectedItem.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceAddRoomsScreenSelectedItem.iPad-pseudo-0.png
index f9ed58886..14bead8d2 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceAddRoomsScreenSelectedItem.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceAddRoomsScreenSelectedItem.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c70a09120ce3dc01107896ec70d0e076f1d0b901a40937952c352bdfe565f04
-size 93873
+oid sha256:a284c90d735b87701d3befd429d4919ac04c01c9b17fe4edffab9c74a9969d3f
+size 93676
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceAddRoomsScreenSelectedItem.iPhone-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceAddRoomsScreenSelectedItem.iPhone-en-GB-0.png
index 93210cf01..51d3811c7 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceAddRoomsScreenSelectedItem.iPhone-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceAddRoomsScreenSelectedItem.iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f790485c5e41e08e8df8a920dd77fda1a7068712281e597b38d1d98654362a0
-size 52536
+oid sha256:2d860236036073c7183f912c0192b6d02e39852f459a4fc5fa44a83293d7db92
+size 52413
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceAddRoomsScreenSelectedItem.iPhone-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceAddRoomsScreenSelectedItem.iPhone-pseudo-0.png
index 93210cf01..51d3811c7 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceAddRoomsScreenSelectedItem.iPhone-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceAddRoomsScreenSelectedItem.iPhone-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f790485c5e41e08e8df8a920dd77fda1a7068712281e597b38d1d98654362a0
-size 52536
+oid sha256:2d860236036073c7183f912c0192b6d02e39852f459a4fc5fa44a83293d7db92
+size 52413
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPad-en-GB-0.png
index 3d5055ace..fb2f80627 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce04e4f79ed0632c9dbdfc891963ebd08aa5447eb782f86873168979a55817e0
-size 214907
+oid sha256:8a56937dcc44ef2f6a6d3831ab80df944fe2c9b449d44cfacb5fe4deb91a7ad8
+size 215153
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPad-pseudo-0.png
index 9040f5178..8d62a53c6 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f409fd1ed78274d4ccff90aedfb321bdf0abfcfe274d5b3aa10101fc5c7714f
-size 220182
+oid sha256:0b944e5658e2ae4226b27c6d7cb824063ab48dfabd0c8314836eab41e183dca0
+size 220406
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPhone-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPhone-en-GB-0.png
index d0c08f4b7..2997d4a44 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPhone-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c94f0e194879ac6d8358e72694c9e144207c4c7f319008909102847665d1aa0f
-size 143177
+oid sha256:ccea063f7a92ed3c1a248bcecdf557153cb67b7f3b097778cd2cd880cd25079b
+size 143411
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPhone-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPhone-pseudo-0.png
index be9cc8ec2..cd6ac6fd1 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPhone-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceHeaderView.iPhone-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3787bf835ebccd301323a4cb09f49cf536b37b7d765cdff43c3a5cfb1777c2c
-size 147711
+oid sha256:e6b2f80951db2a0d70679de8c43304856872522cfa09f15bfcc982ab819b3bd0
+size 147987
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.New-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.New-Space-iPad-en-GB.png
index 688aefb4d..6427714df 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.New-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.New-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cab052df30817094d8209e42428b4f0cb35c179fef77f975375adc7cd3835607
-size 139982
+oid sha256:ee0cf168e9615409ab3c679b58f82a90f8c4694453128aab99aa907d9daa57fe
+size 140321
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.New-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.New-Space-iPad-pseudo.png
index 8bf2d871a..14cfbecd0 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.New-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.New-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:99fd56e9a6029714310a2a4be86959ee38193673a4abfde2232e2a1b2870fdc5
-size 148246
+oid sha256:0b5b757358d4d26e12aaeb976da40417d95068909a9c8735ccbee6a960e0d8ed
+size 148616
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.New-Space-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.New-Space-iPhone-en-GB.png
index 61229cc27..629726e28 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.New-Space-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.New-Space-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d31612c2a1cfa6dac734f93ad5b8a5c5a797fbbb6775398cb73e6df0fc0a4b1
-size 92959
+oid sha256:6c38790ccb923c578410bde37d78cef5f65cd66fd061c1211d1f7003648b204c
+size 93208
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.New-Space-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.New-Space-iPhone-pseudo.png
index c4f7575e1..e88bd3c5f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.New-Space-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.New-Space-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d90da47f09ab8bd8a5d5b715b46cb7c1a5c2a38b8d75961ce1ffdfe1b777a68f
-size 105790
+oid sha256:a09bdc3bcfbb8f246fa905a0bb84ccf80b16ade253a3ae6c109d9f5eb31367d3
+size 106057
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPad-en-GB-0.png
index 6a6b70de0..f7b17a500 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c29774d6a3123f61a2911942422fa407c87db92481bb7830d0381fc56a879bfc
-size 235682
+oid sha256:eb633f3375cfe7e7b4276c40c90b6d29994e499e9bf67e8ea1e8e306e825db42
+size 236025
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPad-pseudo-0.png
index 096a3961e..20a12de4c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0286a97364d7ca641818e58c1648f28ea79f3da1568b5180c148a252aa7b8439
-size 266563
+oid sha256:d6ec85a0c4a09e448655c2e3f20eb5495ee72b7d511d43422e872db3da460a68
+size 266931
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPhone-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPhone-en-GB-0.png
index 02fa13bc8..6bef05200 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPhone-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f26423ce3faa275ba1dbcd02dd192d8705ea2cf827d065645d234ae43cad6df9
-size 176552
+oid sha256:234d52c28e5453d09086017df24b77a72d75dd0fa1a888b69c314ca82655d4c4
+size 176873
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPhone-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPhone-pseudo-0.png
index a9a8682c9..1a8d4eff4 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPhone-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceScreen.iPhone-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ffa82c6352b285a0f3a1f4da85095e94891604cffa8c1c947574f11f09fe838
-size 200272
+oid sha256:820fa5ee82c3706c00fff8de4d85d7718c33df517af3cbaef7a026398a41cbfb
+size 200530