diff --git a/ElementX/Sources/Other/Avatars.swift b/ElementX/Sources/Other/Avatars.swift
index 28ef538f7..383344f6e 100644
--- a/ElementX/Sources/Other/Avatars.swift
+++ b/ElementX/Sources/Other/Avatars.swift
@@ -146,9 +146,7 @@ enum RoomAvatarSizeOnScreen {
     
     var value: CGFloat {
         switch self {
-        case .notificationSettings:
-            30
-        case .timeline, .leaveSpace, .roomDirectorySearch,
+        case .timeline, .leaveSpace, .notificationSettings, .roomDirectorySearch,
              .completionSuggestions, .authorizedSpaces, .createRoomSelectSpace,
              .spaceFilters, .globalSearch:
             32
diff --git a/ElementX/Sources/Screens/Settings/NotificationSettingsEditScreen/View/NotificationSettingsEditScreenRoomCell.swift b/ElementX/Sources/Screens/Settings/NotificationSettingsEditScreen/View/NotificationSettingsEditScreenRoomCell.swift
index d83fabcc4..79eec5e75 100644
--- a/ElementX/Sources/Screens/Settings/NotificationSettingsEditScreen/View/NotificationSettingsEditScreenRoomCell.swift
+++ b/ElementX/Sources/Screens/Settings/NotificationSettingsEditScreen/View/NotificationSettingsEditScreenRoomCell.swift
@@ -16,7 +16,7 @@ struct NotificationSettingsEditScreenRoomCell: View {
     let context: NotificationSettingsEditScreenViewModel.Context
     
     var body: some View {
-        ListRow(label: .action(title: room.name,
+        ListRow(label: .avatar(title: room.name,
                                icon: avatar),
                 details: roomDetailsLabel,
                 kind: .navigationLink {
@@ -47,7 +47,18 @@ struct NotificationSettingsEditScreenRoomCell: View {
 }
 
 struct NotificationSettingsEditScreenRoomCell_Previews: PreviewProvider, TestablePreview {
+    static let (rooms, viewModel) = makeRooms()
+    
     static var previews: some View {
+        Form {
+            ForEach(rooms) { room in
+                NotificationSettingsEditScreenRoomCell(room: room, context: viewModel.context)
+            }
+        }
+        .compoundList()
+    }
+    
+    private static func makeRooms() -> ([NotificationSettingsEditScreenRoom], NotificationSettingsEditScreenViewModel) {
         let summaryProvider = RoomSummaryProviderMock(.init(state: .loaded(.mockRooms)))
         
         let notificationSettingsProxy = NotificationSettingsProxyMock(with: .init())
@@ -59,17 +70,13 @@ struct NotificationSettingsEditScreenRoomCell_Previews: PreviewProvider, Testabl
         let viewModel = NotificationSettingsEditScreenViewModel(chatType: .groupChat,
                                                                 userSession: userSession)
         
-        let rooms: [NotificationSettingsEditScreenRoom] = summaryProvider.roomListPublisher.value.compactMap { summary -> NotificationSettingsEditScreenRoom? in
+        let rooms = summaryProvider.roomListPublisher.value.map { summary in
             NotificationSettingsEditScreenRoom(id: UUID().uuidString,
                                                roomId: summary.id,
                                                name: summary.name,
                                                avatar: summary.avatar)
         }
         
-        return VStack(spacing: 0) {
-            ForEach(rooms) { room in
-                NotificationSettingsEditScreenRoomCell(room: room, context: viewModel.context)
-            }
-        }
+        return (rooms, viewModel)
     }
 }
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-iPad-en-GB.png
index 9ec57fc7f..8ce86d5e0 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:faf162dff5eb7fc8ea28d1aa86e9f0814163aa58d5c270c0928f2c0a3f27deda
-size 162535
+oid sha256:7048f63eb05a9c1a4615264553c3a368ca7e2f86ce7fdedec1f98e83d30b0e4f
+size 162457
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-iPad-pseudo.png
index 0f070a3be..db897aae6 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c6c6fa774d50781e19b4221b66bb68f46ef2bd79b0b0de400c1cd735cf8075a
-size 196892
+oid sha256:55baa7b2886bc204990e3dd6133171ac916219113f93338a39a17a4e2f96334c
+size 196858
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-iPhone-en-GB.png
index 70157730f..724cdef6b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:083cc14d3532a544d9ccacd5feb2f6cceb318b9b8c199d1465f19747020b9cb7
-size 110859
+oid sha256:ef701293a963175e5495cb3e3953b9ad81b826ed6d90c0cd59699a052bb01a7d
+size 110888
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-iPhone-pseudo.png
index 88d714e19..9f0983cc9 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3ccc862dd953f26c2422ed9fb1f3352a7a2762608493a0ac44992e9a613f47b
-size 133029
+oid sha256:cb8caa6ad254be13f63446f80ee39a3363281d26683fadc32f17bdde6d23c0e0
+size 133028
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-with-already-selected-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-with-already-selected-Space-iPad-en-GB.png
index 69fc68a3b..e10fabefc 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-with-already-selected-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-with-already-selected-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:abcce26c62197d1c8bece6839f1330f40c2929475c3b660ebe9a300f455401e1
-size 147156
+oid sha256:019219d2ef26d067103c63fdd9af56a1208f76fdf16b0fef178574709b47cb3c
+size 147225
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-with-already-selected-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-with-already-selected-Space-iPad-pseudo.png
index 1700e6b6b..8fc83e680 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-with-already-selected-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-with-already-selected-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10b7c2d38b95747d57900b293fe84f98dc50045d7458854d92927346b41221b4
-size 175246
+oid sha256:0cd5fd85dd8dc7509444193469f21deb1cc44db1e671489a2b4ebb3ae4a65d2e
+size 175248
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-with-already-selected-Space-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-with-already-selected-Space-iPhone-en-GB.png
index 60afc1be6..2795e9c34 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-with-already-selected-Space-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-with-already-selected-Space-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0cf3c10e39710f0312c1e2080116a5d24efbbd5183afa34a014ccf953755fe8
-size 97290
+oid sha256:0f5ce91eda06bd3c62851aa46d8ef21a3f50fd29c82effe5fab336c2552c355d
+size 96959
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-with-already-selected-Space-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-with-already-selected-Space-iPhone-pseudo.png
index 1fd26e6a6..c6fc370bf 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-with-already-selected-Space-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Knockable-Room-with-already-selected-Space-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1403d16708e9a78d9744c7550e6ca6e10087cbf1286e65c7ebdcdf4e36c45493
-size 126980
+oid sha256:20e46b8749319fc9c756127050666cf944a2eaf1bfb2f65ea6e0a7289ec9e914
+size 126999
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-existing-alias-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-existing-alias-iPad-en-GB.png
index 357c50efb..63236fbd4 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-existing-alias-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-existing-alias-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7fb565c0883a5ef0040eeb595cc3fb60aaa85d2fb7eb526614974c24f8cf1a8
-size 163197
+oid sha256:7ba469816961c8d6dac3b7213d5bdc2f0f83529d19869df563a1e846c3ce89c6
+size 163130
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-existing-alias-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-existing-alias-iPad-pseudo.png
index 292655920..427dfefa9 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-existing-alias-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-existing-alias-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0353d96912e2edf8fb0efb8b5eddb2131787226ec289fa970300ac7cef2ba477
-size 199612
+oid sha256:665b32aee84377fdeb924101b3ffe2a4567001d7c9594d41f05922568e1f3a9d
+size 199604
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-existing-alias-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-existing-alias-iPhone-en-GB.png
index f6df3f409..42fcd116b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-existing-alias-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-existing-alias-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa656563f729a7ade042a55a90d70685bff9695c92c131ceeaf1b9ee0de11b21
-size 114064
+oid sha256:d07f33072edd4d991b2d4010c84b106bdfb7c03ab81ee81040f4ab397b25d867
+size 113872
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-existing-alias-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-existing-alias-iPhone-pseudo.png
index b8fc9342b..3c95fe836 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-existing-alias-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-existing-alias-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:264a4998fcc92501882ee38371c3b2ebb7829aec388da816ce62b65ed3e33154
-size 149892
+oid sha256:7a51db646f8ade16c8060410e8979f4d767864d84d6184ff229cc4abdbfbe30c
+size 149933
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-iPad-en-GB.png
index 263f709f6..7f737da6b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4d1b3095d3304ab9ec30007e4e70e5293f30c33fd5e9d046bd706a43d45c874
-size 148137
+oid sha256:84e0f75c39049fe1841b2faf9bf5df37553dad3a501a45defb67a59989c3291f
+size 148061
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-iPad-pseudo.png
index e278b4d28..0f74321cc 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb043cd50e671e81a23cbf200f7fcdad47fcad5d0cb94c43c7581153fbec0b4a
-size 176084
+oid sha256:c4ca854e7a2cc7867090bace3e3abc34c64a1f9cd8d936e2c3905786c7f8ad63
+size 176078
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-iPhone-en-GB.png
index 45113b833..c1ce12803 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8685338a4824af7ecf4f3d959cc7d6ac3d9b8c0f2c1a79937b5e7bb667cca7c0
-size 96133
+oid sha256:7f7b9193c64ceb340cb0826bd43b3afdaa660f19b7219ad49391a6b6b07b126e
+size 95934
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-iPhone-pseudo.png
index 6aa380bad..b15d6ff3c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e3ffd63f133d37e63a42014bcb8126bb962b63088b87ddea817c8c055fbf096
-size 124613
+oid sha256:144ccf5b14dbe2d8c93352c3dac6b1ea298a51ac590c1cc8bfcbb5cf5e4a864e
+size 124666
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-invalid-alias-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-invalid-alias-iPad-en-GB.png
index 98a34543c..a4c0062ff 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-invalid-alias-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-invalid-alias-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0031c0174d064f1a20667ffd9b778760f93a348b5529a26b99220c966a7fed6c
-size 166652
+oid sha256:1e07edbc6f9e474f649b9b82d2226351fe84151b55c60be8415e79245ef10e04
+size 166573
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-invalid-alias-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-invalid-alias-iPad-pseudo.png
index 72c2ea7f1..b01990b1b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-invalid-alias-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-invalid-alias-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36132d6185c711d1e6910927cd34dbf86d490b6747bc7f56c25f293e9f9f188a
-size 207963
+oid sha256:3ba87042da36d1bca9e66d72ab6939a1c67e753b396ec116ede9b96f2bf7afe9
+size 207956
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-invalid-alias-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-invalid-alias-iPhone-en-GB.png
index 64b2f715c..b4daa670c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-invalid-alias-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-invalid-alias-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0de9ff04fbc0ccb4d73b8f46b6944d77195dc66f474262987b3e020f42ed95a7
-size 115925
+oid sha256:c0d917d9757c203a51298f7712db4a3d171c7dd9af60cc1ac25776c74c2cba24
+size 115734
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-invalid-alias-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-invalid-alias-iPhone-pseudo.png
index 0db5bf41b..53b25a29d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-invalid-alias-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Public-Room-invalid-alias-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1fc0d48e9a9f56cd4a4957c86196caeba24b2a73eabc43bba05c7bf6643b65e
-size 149588
+oid sha256:d68a97bc0d7d5cf06024b3ad49e2e9da52c917a42a3e68be8b9cc42bce7abd3b
+size 149627
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-iPad-en-GB.png
index 28548c307..a1dc811d5 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2701ba140291c7f18c7ab16cffb11f0faeeb1599285b4428a2cddcf5da86f16
-size 130428
+oid sha256:4108700c8e2eba189dd28af81af0a6da69aaa363ce7e1c9710c8aa5afde67786
+size 130358
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-iPad-pseudo.png
index 072cf9b8b..146f03b9a 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d4a88c8182928cd743c98b9caad19bc0781127358d037c23a05f9d723fadcaf
-size 152336
+oid sha256:8712c4f1e5df3cc49cd861db5eac40c2a66c3d48e6c14afd1bcd624a81538555
+size 152324
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-iPhone-en-GB.png
index a84f9fe10..9d0917820 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b1f2b600648556cb4f6891d297c6837db63a21f4819ad13597363d497b7e76b2
-size 79358
+oid sha256:4d2cd5e675b0be333c6b63b42083da3fb5fc240cfa38df234579be5e6ce626ad
+size 79378
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-iPhone-pseudo.png
index 89109a9b7..24f2794ab 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fd3709b96c3fa8ce6a7c2432dafc9d2cfe8b1a25d6eb0bc14a3ffd51cad9d623
-size 97898
+oid sha256:c1dfdb68cbd6f78038fb6ec7c2b5a86b3296d585b4bc0c437ddca216b556eb92
+size 97948
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-a-selected-Space-from-the-list-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-a-selected-Space-from-the-list-iPad-en-GB.png
index 5b73559eb..76db777c6 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-a-selected-Space-from-the-list-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-a-selected-Space-from-the-list-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86226309e1c1fc5615323d41950a590a2edb3b0d966888992d7e0c11b05d9111
-size 147231
+oid sha256:8e3544787e96a5522ba2859afe7b67205da2b747f19a1aa41afc73bfada5cf7b
+size 147194
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-a-selected-Space-from-the-list-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-a-selected-Space-from-the-list-iPad-pseudo.png
index 4cee9341e..dff5de54d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-a-selected-Space-from-the-list-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-a-selected-Space-from-the-list-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f444e9d1c736454e21a08fc698bab6367dee679b27bddec61e9b19f43cd50da
-size 167909
+oid sha256:46b1cc8e61ea555920681169e406bc11da6c4da315ef5c43b881c46507bd3bff
+size 167929
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-a-selected-Space-from-the-list-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-a-selected-Space-from-the-list-iPhone-en-GB.png
index aecdc8c82..aa19d8afe 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-a-selected-Space-from-the-list-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-a-selected-Space-from-the-list-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8cf2f54650d6e216273a80c8b9b43103a8ac3d14d83a24eaad368d2b9247c813
-size 94521
+oid sha256:222e3a386ab64edeb5462b72bf30e48b792555f20c40d1332d9522f2c9a75d87
+size 94520
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-a-selected-Space-from-the-list-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-a-selected-Space-from-the-list-iPhone-pseudo.png
index 65f96cb84..e87cfe377 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-a-selected-Space-from-the-list-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-a-selected-Space-from-the-list-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b14cf8050fb9b80e34c30e05ffe0bb2f006b8b9f7b6f60242045f3f631b50ccc
-size 114427
+oid sha256:edd477ddba3c268878b8cb51774cf3c323844c57877688a326ec11501ac5403e
+size 114441
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-already-selected-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-already-selected-Space-iPad-en-GB.png
index fcce1df93..b83041e1b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-already-selected-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-already-selected-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:085be02b57615275bb18244f9d0a62522f7a2407fc1f8514ff2025b5572ff907
-size 135888
+oid sha256:016ea3ba507b809967e624b705dc2a510d77f65920d41bd7d5f357bb972a4656
+size 135937
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-already-selected-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-already-selected-Space-iPad-pseudo.png
index fa3748ee8..fa5e589a6 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-already-selected-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-already-selected-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:523be074d870b3cca9a4a5905be2b80b284a83293cb7907e39a4983fc9681cf8
-size 156545
+oid sha256:5e0e3934c676d3994b522fb3178f0610752fa0e3c33b21fb910170d18ef963d3
+size 156548
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-already-selected-Space-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-already-selected-Space-iPhone-en-GB.png
index 451f8be61..bd3685c4d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-already-selected-Space-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-already-selected-Space-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9623990b72ef112780c25ff0704f4585e34ac13f5e151f30c8ed72310e2972f
-size 84009
+oid sha256:bc01f96eebaa6c79a314052cae7d7e11bc87eac9c68795e44604a2bc1affc9b0
+size 83974
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-already-selected-Space-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-already-selected-Space-iPhone-pseudo.png
index 0fdcbb9bc..44a780a27 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-already-selected-Space-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-already-selected-Space-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e82d9605692ee2e53d14424b6ae54d349bdb4616e112b1f9c2abf43994a3ffa0
-size 104157
+oid sha256:a28de95a81bddea5eb96a85739b95e388a44e7d76428fe00ee1b1041da4b47f7
+size 104113
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-avatar-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-avatar-iPad-en-GB.png
index 9e4ec12d1..05aa1ad10 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-avatar-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-avatar-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc61ffad782cc983ca5a1d3f6b4533862133cb90f3f5ca0e348af13c3b1513e4
-size 164011
+oid sha256:c503908c998eaeb716be5e6defadb241807dbcbb10beea7f71854ddb590caa65
+size 163941
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-avatar-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-avatar-iPad-pseudo.png
index 6ca92e7f9..fa91f0034 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-avatar-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-avatar-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24d39e17deb1e519df4b76fc0daba83d81d213b6cb2175b41f1a87ffe72b7c6c
-size 186045
+oid sha256:d874966fd86071dc8ea2efaca907c4ae3c05a0ff4e8b59b972a5e57ea5e04293
+size 186033
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-avatar-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-avatar-iPhone-en-GB.png
index 6f1f6e0d1..23ef3e3e3 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-avatar-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-avatar-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02e0eaab4152da5b5d13aae3e3c031371122af583334cf84a0fab44a625695b8
-size 111619
+oid sha256:8db579c17d26ce3ef658d23cb23fc0b0d0c033b8ef35adf9b011ecc9cd511c55
+size 111639
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-avatar-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-avatar-iPhone-pseudo.png
index d78fab700..563eb094d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-avatar-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Room-with-avatar-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e52629adfcddd0759942f662de72fec58f52fe5f6ea57eb5fceffe8e8c993e18
-size 130548
+oid sha256:686ee1eb30703b056c02ca7332bd47174b6a364e659dfae31a0511906cbdd9af
+size 130598
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-iPad-en-GB.png
index 11aac0387..948851db6 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26db41712c97cdaac95e0ac472cd51ef9c1eaa5b061772d0d3b29607119370e6
-size 122463
+oid sha256:f9351e1d2fdc6e1f32563fa4c6030e13fc159d5a2b5e72b9afee727891986ba9
+size 122408
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-iPad-pseudo.png
index dfce388e8..eec56bb8a 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:519c73c848249059fff53660f620782acb57e659f6abd74f8a4cafe55d72d8b8
-size 140067
+oid sha256:ba02c3e0be8fd36f2adabfe8bda5a3b38b5e82db39ffc8dbafb6d5a1c4ba605a
+size 140045
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-iPhone-en-GB.png
index b48150f1f..06a774419 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d1034f8e10e23a2bc26e786282c410c1d7de0e8470ad1c56864cfe590eee8f59
-size 72128
+oid sha256:75fa7c9e8e2a0a8796a10b0957ee7191b99d4f7dff77112eb81def66f0b8d622
+size 72138
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-iPhone-pseudo.png
index 7bb947092..585c4bf3e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:209e035e81ae7f56cf2144dd469b555cb7551c030fbb1f968510ddb39c6254bc
-size 88863
+oid sha256:f1f793a9ffc70d401d5ac9243393208af3cbdd6bfe88145ae81fb5d76d4d4026
+size 88884
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-with-avatar-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-with-avatar-iPad-en-GB.png
index d5f4e4722..0d78e78d8 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-with-avatar-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-with-avatar-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cefbffbebbe8389b2fdb203d3aed7e05c54a307de0fe3d6f5807de306559d583
-size 158430
+oid sha256:284bfd8e77d1c5da4820fb0a0773181f67ed0be4e7f71303e38f21f511eef5fa
+size 158370
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-with-avatar-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-with-avatar-iPad-pseudo.png
index 6ebba9bc5..3fd83d210 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-with-avatar-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-with-avatar-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f205ff93653367e04b89e3c33451fa98c9e83b419320651754d10a2f7ac2cadb
-size 176333
+oid sha256:1764e6ddbb3f40186cbbeae0e5d9464831b39a5f9ea7b22cbc17eaa7240f26de
+size 176307
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-with-avatar-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-with-avatar-iPhone-en-GB.png
index 7e6467804..3808d60da 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-with-avatar-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-with-avatar-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a268d90c09db11d61a5d483f4777df346fa7ddc28577f004d436f3637b973155
-size 107377
+oid sha256:403f000e15fa4a84a278d5a26ff35066555fc9ee560d975733cc81d8527cc3a6
+size 107384
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-with-avatar-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-with-avatar-iPhone-pseudo.png
index cafca4c55..5623f205e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-with-avatar-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/createRoom.Create-Space-with-avatar-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa90851532098954fa5a942ee3ac8f1f24ca20a97b9039aa31281e900124bf1d
-size 124376
+oid sha256:48841a675a390c5bfe6de1f51419ad866b13e71f88e391c11ebd3a973fce2499
+size 124394
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/labsScreen.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/labsScreen.iPad-en-GB-0.png
index 667a570e2..cc6b7f40d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/labsScreen.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/labsScreen.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:596b880af417ee76145eb04c279f2ef871790369cfe8a32af61997f73ef86ce5
-size 116682
+oid sha256:55c2009e0946a36a4a565e02633d3ac3efcf6a994c465e44f886a4c091b0cf1c
+size 116661
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/labsScreen.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/labsScreen.iPad-pseudo-0.png
index 04bcb555d..5e0c44ffb 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/labsScreen.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/labsScreen.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b611d1d7d04d06148949f5ba526c83960e5da6ec9d61dffd29b730a7bc9d4c62
-size 134943
+oid sha256:f3dad72bdcfd0012d23d7cd05fe66d7e2ff00ae484c5542e9801a06c46b3eb12
+size 134933
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/labsScreen.iPhone-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/labsScreen.iPhone-en-GB-0.png
index 70b54b7ea..e0e1ddc7d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/labsScreen.iPhone-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/labsScreen.iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7981c4f24c70dc204f4f03e22f7c46ff7bbff90e720467a997298fcf18e0756a
+oid sha256:e3da6a59855742215d1ecfb09b7bde2c40d644d710eeaeae9834515380c33ea3
 size 69203
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/labsScreen.iPhone-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/labsScreen.iPhone-pseudo-0.png
index 36d171b65..7ac358f50 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/labsScreen.iPhone-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/labsScreen.iPhone-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d390e06920a437a707ecd78e448eee7e3d41955a0eb17201d76abeb531dcc69f
-size 100135
+oid sha256:fe4d90583ba4322d3cf96d939208681c44343db787c62185a0f2e2a354c7b930
+size 100156
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-Disabled-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-Disabled-iPad-en-GB.png
index d6d09a0ed..445940298 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-Disabled-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-Disabled-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a760e19fbde3ec2e3a6371139c9cd14bba452a55304cd9d81583cbb577739840
-size 193648
+oid sha256:d50dbd88b172d92dec115b2103ad47657893fa16d6a784f12f8e9b7a6730b450
+size 193674
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-Disabled-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-Disabled-iPad-pseudo.png
index 3fc81e8cb..b7e11927f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-Disabled-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-Disabled-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:efd721b263efce506879027a3769592f8b6dbd1f54e2a5acbffedb0b1faa282f
-size 195081
+oid sha256:576b211448db9cd996acd16dd64afd8d19a2024daf6e4b03da29b40457e53988
+size 195107
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-Disabled-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-Disabled-iPhone-en-GB.png
index 6e0652f94..31cea94db 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-Disabled-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-Disabled-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c2ba241a8e2563afd9197d03fcbf0d60c9be314eddb47478eadbbda8a5c0210
-size 132877
+oid sha256:bc45a839c4b1344e2da9a227eefeae9cbc3dc783fcab5e523ddc34b3d1e5b92c
+size 133268
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-Disabled-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-Disabled-iPhone-pseudo.png
index 94c3708e2..83b3da99c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-Disabled-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-Disabled-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a17dc37b90a4512451e7f7c2b6234ca87cfb38a42b42a9031243eca5220e6ba2
-size 137517
+oid sha256:a38bed2f2a98e4c3036ae12211a45c914ea82a27a78db99f1652b6f1c55a8a7a
+size 137966
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-iPad-en-GB.png
index de0ac89ca..156c18c7d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1cfb0bcefd156f712188cffff48859f55c0b338105e7de78338c011466a56bed
-size 194045
+oid sha256:483cc4f3ccb745ff2dd2060ecb659183ea1b41d1ce48a3b81c99b014ec724548
+size 194134
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-iPad-pseudo.png
index 011e87a55..9cef0a0cd 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0d36846bd6d1ad937c5c6fc6b10d52a10f7d3746332e1706bfb8e760061654c
-size 195492
+oid sha256:a6248a840f28ccc9a17b4637d598b255cf535dd872e9cd0b9bcd16eb111c507d
+size 195516
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-iPhone-en-GB.png
index bba4018cf..49100bd12 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:667f0eb0f9584d46c2cf996f04704f7d912d815ef6e4b614af7b6d57631fa77f
-size 133288
+oid sha256:baedfec00c9d85bf2e7b8b30c21024b045d7fb08296eeb217ee6d419ad67c589
+size 133606
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-iPhone-pseudo.png
index 85de958f1..275a9d4c0 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.All-Actions-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39cb3601e6825adc9498dfb385d3b58af2f387caf81e96d8d8a25a9ae8a39d71
-size 137963
+oid sha256:444a608f0457ea0cb05ec4a8d0e3681ec44ec8ce13a6bc149040163829344ede
+size 138361
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Ban-Only-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Ban-Only-iPad-en-GB.png
index 36073ef03..6fb9a2de1 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Ban-Only-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Ban-Only-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee4dc756ce14f46e8bb430919dc69cd86d51317051296f837bc2bfadc22ea720
-size 189596
+oid sha256:a46718bfde95e7d5e8ee9c7023049609a7219f071b910140854a41b95f3b73b0
+size 189634
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Ban-Only-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Ban-Only-iPad-pseudo.png
index 0a30e6168..0f457a56f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Ban-Only-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Ban-Only-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3d297fc612aee2ecae95f7631db6c409dce27894018f9abade3cc97393d4b9f
-size 190703
+oid sha256:4506a10dff490e347e8fb3bfa462cebea4fa38aabc9e470603c6c1e3025ae52f
+size 190736
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Ban-Only-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Ban-Only-iPhone-en-GB.png
index 71599c68d..beba5cd20 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Ban-Only-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Ban-Only-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1def1bca51e89688a124aca11d68cb47497294b95c29d7d15a6a1d5528d693e
-size 129099
+oid sha256:3ddf601400c1c22ee6633b0d62a42a7076e2cb2c5510a0a8e345de73776bf50d
+size 129151
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Ban-Only-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Ban-Only-iPhone-pseudo.png
index 181b537b1..d085b7a38 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Ban-Only-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Ban-Only-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d02eba49e98e891720ab06951f4a9d401a6c69fe851fa1b013d8b28da335b5c
-size 132345
+oid sha256:062f7d3485f6af248615fe363d134c05b507baf9e0c1f4c4e41a85467077ee55
+size 132337
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Kick-Only-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Kick-Only-iPad-en-GB.png
index f9187e0eb..ba6dacece 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Kick-Only-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Kick-Only-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7700587037ab70b796cd185bba754c508d2c76563893397439195e87b88a6a43
-size 189408
+oid sha256:865fef04f2c09a2859f687d3a4ff0f2da51c77f8c79f28f3319219a4be282b95
+size 189409
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Kick-Only-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Kick-Only-iPad-pseudo.png
index a01ee8a9a..f29152e0d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Kick-Only-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Kick-Only-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34a4af45a45190822464d95def232aebace4fe222bf137b3a004cafe9259a31a
-size 190464
+oid sha256:46f0086b0bbc8a704f63b04a8e0e4dddc0e929c13ffb80b824b73e98118e6bf3
+size 190497
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Kick-Only-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Kick-Only-iPhone-en-GB.png
index acd6dde78..ff4d87007 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Kick-Only-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Kick-Only-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:500628fa11d484723a77059095ed41109a7a36acc26fd2c85b190940e3b43222
-size 129132
+oid sha256:b3c541cf2f8d40fd79d64ed211e388a08e3e444f4ac042febf2e017985852dc1
+size 129150
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Kick-Only-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Kick-Only-iPhone-pseudo.png
index ff497ea7d..12d84e565 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Kick-Only-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Kick-Only-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8067dba3f13471da116366b4913395c72b61832253a6c25ad02021febde215e0
-size 132578
+oid sha256:b4d96b562711ec72d24318c44f457f2496307244bd0b9a4f50c3b5aaf891b613
+size 132553
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Unban-Only-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Unban-Only-iPad-en-GB.png
index d8f846215..ebb1fb954 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Unban-Only-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Unban-Only-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18c10f31498a36b639e3aeee03ab519195466c49b33d9516c2d71a866753f73f
-size 102616
+oid sha256:0fc0d792e706e8487bf0f7021d2fe7ebe9fe6c8155eef8d24aca606fff4412c0
+size 102659
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Unban-Only-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Unban-Only-iPad-pseudo.png
index f98ae5519..94bff5716 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Unban-Only-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Unban-Only-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7c834bb4a4eb1ddd37e573191ad432b72716201fec62972e5af792168cefb42
-size 103607
+oid sha256:ec94b0ce1db8bf6342ff897d9011a0a650153a9bd43ba7d48f5740b408ab7aac
+size 103614
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Unban-Only-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Unban-Only-iPhone-en-GB.png
index 7c5a9fd4e..b7d9d688e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Unban-Only-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Unban-Only-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32a3fcd37d8670b741f23dd885172e8e6c980d6e99e199fa5b75dcd99c4b7506
-size 53735
+oid sha256:0d16544e1463e12a9b4e3c5daa122b43115aefdd80082f0f44ac1c539ee26755
+size 53759
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Unban-Only-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Unban-Only-iPhone-pseudo.png
index d10e26af4..b5a02922d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Unban-Only-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/manageRoomMemberSheetView.Unban-Only-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4da6503c059376b814b1dfd94aa8fd8d0af3855bbaca64dd2a11e0c54cb85b2a
-size 56292
+oid sha256:0993286622757c6919e0e95343a2951da68be3c13a5e4458f2b8e898496686b9
+size 56277
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/notificationSettingsEditScreenRoomCell.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/notificationSettingsEditScreenRoomCell.iPad-en-GB-0.png
index b2366f9b1..e9f784846 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/notificationSettingsEditScreenRoomCell.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/notificationSettingsEditScreenRoomCell.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d02bedba2a9aec4e07a08817ff592de71cd8e7ec7da49648fc63ed41ea33bbd6
-size 130289
+oid sha256:d29f590a536adfb2807e1a2d63f6526792e0b124e492796931961d8108bff620
+size 140554
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/notificationSettingsEditScreenRoomCell.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/notificationSettingsEditScreenRoomCell.iPad-pseudo-0.png
index b2366f9b1..e9f784846 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/notificationSettingsEditScreenRoomCell.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/notificationSettingsEditScreenRoomCell.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d02bedba2a9aec4e07a08817ff592de71cd8e7ec7da49648fc63ed41ea33bbd6
-size 130289
+oid sha256:d29f590a536adfb2807e1a2d63f6526792e0b124e492796931961d8108bff620
+size 140554
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/notificationSettingsEditScreenRoomCell.iPhone-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/notificationSettingsEditScreenRoomCell.iPhone-en-GB-0.png
index c6cfd4127..7b3f68f2c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/notificationSettingsEditScreenRoomCell.iPhone-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/notificationSettingsEditScreenRoomCell.iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:526e8a21d3eb172a18bafb7ecad5c3907e12a835310664dd204b4ba1f3388b0d
-size 86455
+oid sha256:2341edddf6f5c4c28e8cfdcef10a60b787e579520d29b4da7c4e4292fba11d4e
+size 92071
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/notificationSettingsEditScreenRoomCell.iPhone-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/notificationSettingsEditScreenRoomCell.iPhone-pseudo-0.png
index c6cfd4127..7b3f68f2c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/notificationSettingsEditScreenRoomCell.iPhone-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/notificationSettingsEditScreenRoomCell.iPhone-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:526e8a21d3eb172a18bafb7ecad5c3907e12a835310664dd204b4ba1f3388b0d
-size 86455
+oid sha256:2341edddf6f5c4c28e8cfdcef10a60b787e579520d29b4da7c4e4292fba11d4e
+size 92071
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verification-Violation-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verification-Violation-iPad-en-GB.png
index c341b2539..909a1b2c3 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verification-Violation-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verification-Violation-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11b0908c56d1b72ab28424aebdb2444707296fe8a19a35524fae13d362880a50
-size 342958
+oid sha256:0b3274f218d2b250582f94386b15fa2b65d0738e339330e8cd0da4df7e6ff137
+size 342840
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verification-Violation-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verification-Violation-iPad-pseudo.png
index 0242e0b70..92a353d30 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verification-Violation-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verification-Violation-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9778e0dc9863ab1af20de69ed6ac12608dda37eed5771b592a5b465a79e1b600
-size 364979
+oid sha256:7aea93983e9424dc59c47dfe415e93766289bd50db36e120d210d0d314966369
+size 364864
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verification-Violation-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verification-Violation-iPhone-en-GB.png
index 850b396a4..193bf37a7 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verification-Violation-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verification-Violation-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dc3c81b4fe698bbe831bc156a03c0ed109bbeac1a78e28ed47645b5353c74a82
-size 256097
+oid sha256:ed47f3a29202fb473589a76c11469e5612f56bc37f285bbdd642b8b1ea141bf3
+size 256147
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verification-Violation-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verification-Violation-iPhone-pseudo.png
index 8bc67b1a4..73d042ecc 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verification-Violation-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verification-Violation-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3ffe35b8bc9135e0878d01074ce15328d8131b7ac2e73f9217cb9827c0186ba
-size 287761
+oid sha256:fa53685f6ab7f701eac570604b53ba1ecc841e2b3ab93b9e3e49942a5c1d8116
+size 287534
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verified-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verified-iPad-en-GB.png
index abc04184f..9e8f3dc2c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verified-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verified-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53c2ab675c58b84c9b85e8a58c34a1ae5393f02f55a99ef0d1cf8fdafcb8f7c1
-size 343059
+oid sha256:7bda331452abe9830ca09f8f0f148c6b89c2008e1d13353a021f637d17535070
+size 342955
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verified-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verified-iPad-pseudo.png
index 198ff8bf9..b8dac8035 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verified-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verified-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:446b60b41552f3882229850b79b2f11c4645dcffda091329a28eb95bf750c6fe
-size 365079
+oid sha256:cbb4764e0a68540f392f03c74a7282f2651c4090b5eacdaf0b34b8119c214ba6
+size 364960
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verified-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verified-iPhone-en-GB.png
index 45a072c48..fd1404133 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verified-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verified-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c3873fc7a7795a581b09baeac00faffa14ba932070232dfa62fb99e9b7811ce8
-size 256186
+oid sha256:c409b5b162934442268da484c1b1773d8e6536230dba9423946202e10cd72ef2
+size 256248
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verified-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verified-iPhone-pseudo.png
index 1961fceeb..795c77486 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verified-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-Verified-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82d54f1a415b6e9b24ec113bb138dc5511732e6c5de9a5b1af648b3efa2550b8
-size 287855
+oid sha256:4ae6426b4739f76883b48bacda47c616244bfebac0d8cc1b0334a3b20e6031ad
+size 287606
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-iPad-en-GB.png
index 257d2be62..8fb93a670 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cbd9e27e30b60f22217d9987d0f4697be0d4774738320ccc3dbb64aa994587ab
-size 341938
+oid sha256:f70c051431969024f00c3af951ce9b95a3bedb5e140052e1e610276faf0ad5ae
+size 341859
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-iPad-pseudo.png
index 8e90759cd..5876fd270 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9af2d12f22ec26ab02c417c1f7d654c34d23469453cfad5b3e7574f41a6a931d
-size 364091
+oid sha256:0cbe205023cee8d2529b2b897cd08c3af23dc463f854aa7ed84ffdb33a76d3b6
+size 363974
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-iPhone-en-GB.png
index 33ae3e972..e9794517c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:923f5a5ae72f703b1ec05e754ba1beb430d0a4c34a27aecfefb53adb13d686af
-size 255286
+oid sha256:2205beae29e945e3e04add61e7339c9064fc4e7fd5262e71e6d907bd094c7eeb
+size 255315
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-iPhone-pseudo.png
index ff0cbbc66..ec43b82a8 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.DM-Room-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:522492863f0a78b7440e23b478e9cbf5ae947433c4a00099c471caec4c0a69ae
-size 286869
+oid sha256:86384143430419cd619ed1281321c0f2952c0cff0bde98d270ab9aa6803a4249
+size 286638
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-Joined-History-Visibility-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-Joined-History-Visibility-iPad-en-GB.png
index 448465ec2..859c63c0d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-Joined-History-Visibility-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-Joined-History-Visibility-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:280ac984938be594650070efbe2531785a2f976a99ad493c4775697401d5ae27
-size 286930
+oid sha256:0c760ec262979fb782e4a0df974f6a26cccc24639d967d610064f37b255f351b
+size 286523
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-Joined-History-Visibility-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-Joined-History-Visibility-iPad-pseudo.png
index 9596d865d..eac6a2503 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-Joined-History-Visibility-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-Joined-History-Visibility-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6db671df4407f15e1deb15fdf22a0a0c64c1cff3142200e9d5430c8147aa58a8
-size 315022
+oid sha256:5328ffbafe2d4b06ab5475d5cd388df7aa24b55b42d6cc56fdc61bbdd985a0f6
+size 314563
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-Joined-History-Visibility-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-Joined-History-Visibility-iPhone-en-GB.png
index 25973722f..f59ef9ac5 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-Joined-History-Visibility-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-Joined-History-Visibility-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:243ac58d717843a64ae312400cc88280b490ce93f7c86e08c72f87f860c0bf9a
-size 190413
+oid sha256:64a25834c837953ea3120dc19fd2263a8fbd1608ee3e82e3541f917c3f1ec57a
+size 190638
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-Joined-History-Visibility-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-Joined-History-Visibility-iPhone-pseudo.png
index 227c87fde..2d5989801 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-Joined-History-Visibility-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-Joined-History-Visibility-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c0cc74340905c73b1cdf60c8d219a03d5d284599fbe1afd54aacc83e2706d187
-size 222615
+oid sha256:39e1a6a6c22b7cb920d03a01f74116b0d83b8b0717fafd83f85e7b946ad457de
+size 222811
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-World-Readable-History-Visibility-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-World-Readable-History-Visibility-iPad-en-GB.png
index 970edc6b8..6d9be81ef 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-World-Readable-History-Visibility-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-World-Readable-History-Visibility-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6836b8514a723fc0b52a76be0bf574b9f10d18a378f011595b80d41a4f47e80e
-size 285873
+oid sha256:418e36ed083f8cc4ad92a3653e2b5617a112b647fe2e1f999d3dbaa6ab303191
+size 285466
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-World-Readable-History-Visibility-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-World-Readable-History-Visibility-iPad-pseudo.png
index 91cba363c..04a725972 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-World-Readable-History-Visibility-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-World-Readable-History-Visibility-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65bec5f8464e560f1989cb9cc44b0a77182d47a761cb204969da5b55351b9115
-size 312663
+oid sha256:6fd8168fb9cb33fccdac832a38b17feef9dcc0ac13dce57f27bf0067a883b21f
+size 312192
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-World-Readable-History-Visibility-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-World-Readable-History-Visibility-iPhone-en-GB.png
index 0a0a209d5..9677cfcbe 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-World-Readable-History-Visibility-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-World-Readable-History-Visibility-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5166d57648f2ce6fbf2011f783bbf8e36195540be80d39904d135a1c1e135a9
-size 189652
+oid sha256:31cbb156f96594886222e53cc5fa5632a2a001638efb3b958961fd261364237e
+size 189861
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-World-Readable-History-Visibility-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-World-Readable-History-Visibility-iPhone-pseudo.png
index d20d69c4f..761248a55 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-World-Readable-History-Visibility-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Generic-Room-World-Readable-History-Visibility-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ac7e72447a0c59fb3bbe00c711e9e7678ae49ae69713017aabdbf6b834ee69b
-size 224345
+oid sha256:136ecb4f3b2a6a1439501fdca2b4b45bff8aad1ff9ce3e9cbedfc2396aaff1f2
+size 224472
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPad-en-GB.png
index 045fac89e..6723bf5ce 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b1e2722597f4da434b05e0647ec4a377beb613555c3c71f8bac049d0f0cfa9f7
-size 207653
+oid sha256:b6021c748a4c5b9bf389da4615146c608a304315dffd12bfcca2b80e2cf650b2
+size 207327
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPad-pseudo.png
index 54d375a67..e1eeab088 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dae72d6fee123c8a9cd86c63dda329ede4b643e3206f3956c45e323494b2cf68
-size 222041
+oid sha256:d78552787ccf3d203b737c700d8c8f56751e4d87850b72e245e2cf51862778d0
+size 221570
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPhone-en-GB.png
index 6333db370..d86d18066 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1529634f7b8ac745a365ba30378d70bc7ab3ba0e061cba71edd380bb161a3db8
-size 131212
+oid sha256:4d44af15528ac9b2e6467756c5d3954692a93ff6d6d1df9bd2b1937b7af2adbf
+size 131242
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPhone-pseudo.png
index 0ed165e1b..849d5f671 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomDetailsScreen.Simple-Room-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bc737092008f3c8f08df5bc0bf234f6c34fe123d5cd30671ce88b2bf7a5440d
-size 155717
+oid sha256:149c89c2ef067e8f131403eb1d06266348c05384eedcd8c82bfaa7a40dfd7b78
+size 155959
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Ignored-User-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Ignored-User-iPad-en-GB.png
index 7fb2b3523..8bafa1626 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Ignored-User-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Ignored-User-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9adb8a0087b4a8fe88108ebb77f90adde6abccbe9eef59b73754dfe001674322
-size 117987
+oid sha256:eaa242a12fd6822c84fcf71ea0efe05a6ea437cf33a57569deed42cd17679cdd
+size 118013
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Ignored-User-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Ignored-User-iPad-pseudo.png
index e45eb4072..64408cb51 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Ignored-User-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Ignored-User-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36615cf3ed75ca28c045c28d1b640075c0a09bc2a1cd17c9bb39d49524909437
-size 120457
+oid sha256:830985c97e0e591594f2f68031d6c25e2f3eab09e015c092879285afb3143bf9
+size 120438
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Ignored-User-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Ignored-User-iPhone-en-GB.png
index 014bce23f..1f21b87ab 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Ignored-User-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Ignored-User-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24d80755a2a080e0e7a7480aadf650b0f3f918e0a465af89c1dda369abf34cf5
-size 67783
+oid sha256:f87082558152addb0cbe190f2bb3097f8193eba8c7ae805d5ccaac573927ea50
+size 67808
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Ignored-User-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Ignored-User-iPhone-pseudo.png
index 9d9986bce..1802ee5b0 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Ignored-User-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Ignored-User-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a158db2abc26ef446bb680a451c3f388f30b8f8d0919f9dcc1c05d9c040f3817
-size 78759
+oid sha256:ef123fff158b656d88c73b86ed702b7cf4b5fc89c6f7a65fd3389c2b362ea8f8
+size 78712
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Other-User-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Other-User-iPad-en-GB.png
index 4904da735..97e29781d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Other-User-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Other-User-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cc1b67357986d2cecc33575882e694c0de4d6a0fd1c0137016995d368abb0b4
-size 117695
+oid sha256:2f6a6d201cf19de913b8deac9d7be554f771450399ca64684430e3a0164dd112
+size 117725
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Other-User-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Other-User-iPad-pseudo.png
index e27498151..d71ecb62a 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Other-User-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Other-User-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c41248b7f0f13aa031e7c2a6298b8f20f033e245a5a4ee870b7329f29c43260
-size 119833
+oid sha256:443cc2abcf1874a39b9d28ef9febd8216e441ce36791eaa5997222f5c601632c
+size 119839
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Other-User-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Other-User-iPhone-en-GB.png
index 4f964f557..f24b54f18 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Other-User-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Other-User-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0947d3946711548aeca6d2686d1e89b7c82b20ddbaddf5a38482cc40c6118532
-size 66937
+oid sha256:95a8f3e44ce5731652fd2dfa44b362e19640030d4d188c4f97b8954eedebca05
+size 66927
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Other-User-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Other-User-iPhone-pseudo.png
index 8679d7636..e33d59678 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Other-User-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Other-User-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24981a375b52ded6dc2811ac678ba6faf2a084edb3ee605ef52619f34e3648f7
+oid sha256:b1228329b0286b73649c63f9e170f85c24cb31f150afca9a804637e599437e01
 size 78028
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verification-Violation-User-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verification-Violation-User-iPad-en-GB.png
index ce0cc8fa2..22336b52c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verification-Violation-User-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verification-Violation-User-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6aa1f5cd340349056ecbc9a69eb06972961f97d5ba064686e9523c682dbc5a88
-size 127866
+oid sha256:2f53ff2541327fa10353e04505bcc6ded8e642c9414d63fa5126b2e754aa84e3
+size 127868
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verification-Violation-User-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verification-Violation-User-iPad-pseudo.png
index 636e3b6e0..0c93ac756 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verification-Violation-User-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verification-Violation-User-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8b214520640c1aa18d72731546fd184684c81785f5fcac040e11844b09ba0ef
-size 135473
+oid sha256:125c15510382d11b4d44889ee75f3430d051202578116f4c2325792981767cc5
+size 135475
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verification-Violation-User-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verification-Violation-User-iPhone-en-GB.png
index 7babdb7ef..c2cd687f1 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verification-Violation-User-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verification-Violation-User-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:594471a96857efd59af70923982a61471549e4dc5d368725178a2d66844efd68
-size 76381
+oid sha256:aea6b723b7d754dd718d85961de62cc1e389c99a30da7902389e6af5bd9b6901
+size 76382
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verification-Violation-User-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verification-Violation-User-iPhone-pseudo.png
index ad7339183..22e970bc3 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verification-Violation-User-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verification-Violation-User-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:edefecb7938d9f34ef0ad9cc89c9f16d2bef07e673a7423ad291edc42a171f1e
-size 95919
+oid sha256:ce7f370a77664c9d982e4dd7ca07515f0b0175e4b163d45dcc5e15bb1e26d63d
+size 95940
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verified-User-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verified-User-iPad-en-GB.png
index 584316435..21ce87876 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verified-User-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verified-User-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5938af29429821463afa16623b8e6c776ed17bc03363458123aadddee29326a3
-size 202891
+oid sha256:477474c53ff1bfcb4640c6d4dbbfc35410559d995d87fe8a9074ae47b11dd667
+size 202899
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verified-User-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verified-User-iPad-pseudo.png
index acad4fa40..4122f63e2 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verified-User-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verified-User-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74c191d5b4007ed4365f5c63ccccf58dad3e821aa99b84aed795a8666c01dd29
-size 204563
+oid sha256:8fba1d2ef2e9c79c6fbb406d6edf87165f0204218248eb78ed98a373bf1c84bf
+size 204565
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verified-User-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verified-User-iPhone-en-GB.png
index 1d6c0c0d2..aeb511be0 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verified-User-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verified-User-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7fdf71e1b1df8ad5ebd8b0db172696fdefc5ef9bb005c03c52365d07ee36e618
-size 140665
+oid sha256:89080c58ed9fb747737a14cf49422222afab9654108109ee531515bb13188de7
+size 140658
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verified-User-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verified-User-iPhone-pseudo.png
index fc772d36c..201af59bc 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verified-User-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomMemberDetailsScreen.Verified-User-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dfcdd4af1ab51b5dcaa8d179887eee3a7ecfb474d8e562e14417ccf7083e8a19
-size 150765
+oid sha256:a2b9b3b131c076d95fbddef6c73d4a52b21a9c09d4534190909a7d2db3b8a9cf
+size 150789
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Encrypted-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Encrypted-iPad-en-GB.png
index a131d49b6..538b413e7 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Encrypted-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Encrypted-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa3a2e91c611e424a5a3428f41da7aeed45a7c427ab484e4b3ca0b86842805c8
-size 111496
+oid sha256:b1c3a092778dd89916edf9e1762b189d618334c62916d430dcb7f02a26da0e9d
+size 111447
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Encrypted-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Encrypted-iPad-pseudo.png
index 6ff397a82..e8507b9d8 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Encrypted-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Encrypted-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:768ff0d668d469acbb0e91a08d22657962a96dbffe062cfbb0484017f3d13b8a
-size 126751
+oid sha256:45b3b85dd9a96d903bf599b837dfe3a23d956c7989af40cbacfffa8283fb748a
+size 126731
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Encrypted-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Encrypted-iPhone-en-GB.png
index ddc8469fc..cd218c994 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Encrypted-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Encrypted-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d84534280625baf2b69a742ab1ed2e5017e51e8c9aaf7785558976fdfcdd1701
-size 65190
+oid sha256:70628211cd73a2d4e39f58467d577d5685126f90da9ba4b9413b90ed884e05c2
+size 65180
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Encrypted-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Encrypted-iPhone-pseudo.png
index 63f2b0737..5f58d47ed 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Encrypted-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Encrypted-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f61436d3e11349dcf124fe5c0cf944cb04bbaeee4fc8c0e408fad890ac875eb2
-size 93721
+oid sha256:63dcabfca6d5e294bc49e5518be0f8d3d65fbdbbe7e9ee59327137ced88c4575
+size 93723
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Unencrypted-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Unencrypted-iPad-en-GB.png
index a131d49b6..538b413e7 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Unencrypted-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Unencrypted-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa3a2e91c611e424a5a3428f41da7aeed45a7c427ab484e4b3ca0b86842805c8
-size 111496
+oid sha256:b1c3a092778dd89916edf9e1762b189d618334c62916d430dcb7f02a26da0e9d
+size 111447
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Unencrypted-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Unencrypted-iPad-pseudo.png
index 6ff397a82..e8507b9d8 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Unencrypted-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Unencrypted-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:768ff0d668d469acbb0e91a08d22657962a96dbffe062cfbb0484017f3d13b8a
-size 126751
+oid sha256:45b3b85dd9a96d903bf599b837dfe3a23d956c7989af40cbacfffa8283fb748a
+size 126731
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Unencrypted-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Unencrypted-iPhone-en-GB.png
index ddc8469fc..cd218c994 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Unencrypted-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Unencrypted-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d84534280625baf2b69a742ab1ed2e5017e51e8c9aaf7785558976fdfcdd1701
-size 65190
+oid sha256:70628211cd73a2d4e39f58467d577d5685126f90da9ba4b9413b90ed884e05c2
+size 65180
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Unencrypted-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Unencrypted-iPhone-pseudo.png
index 63f2b0737..5f58d47ed 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Unencrypted-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomNotificationSettingsUserDefinedScreen.Unencrypted-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f61436d3e11349dcf124fe5c0cf944cb04bbaeee4fc8c0e408fad890ac875eb2
-size 93721
+oid sha256:63dcabfca6d5e294bc49e5518be0f8d3d65fbdbbe7e9ee59327137ced88c4575
+size 93723
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Admin-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Admin-iPad-en-GB.png
index 03bff6e8e..befb58a8d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Admin-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Admin-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2839f5dc356ee88c67df4dc63802faf3c57e4e2cc4ef9c095a104e33fdda4b01
-size 111658
+oid sha256:04bb87b00adf59fb2e82d5201786f2bc1a46c0c7b383956b319da9f7492832b6
+size 111609
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Admin-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Admin-iPad-pseudo.png
index 0da1ea387..013cfba5c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Admin-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Admin-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f7c3881e0aa251a7abb26f9ac9126b20a4f2902068787536cf4a3853a3454c5
-size 116254
+oid sha256:daa260dc381a5cf4fb863ce1ccb9e341a4c775093b6b900bb1a11c24633bdc73
+size 116268
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Admin-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Admin-iPhone-en-GB.png
index a8539b008..eb39f6741 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Admin-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Admin-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be0e9290dadd3c7b59d057e328106bd176ce8a0abc3c54262d139ccd0e1fdd10
-size 62376
+oid sha256:8801fb90d6b0ef7123b5e8753ec6975f1ad96c1c707ecaaa152dda6cb33a526f
+size 62366
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Admin-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Admin-iPhone-pseudo.png
index 6ec306419..6944e0b02 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Admin-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Admin-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3be8bbdfdfc3043e6bbdd27d6ceb2228621107e08010178c0c2aadbda674848
-size 72525
+oid sha256:eb2c9be209bf4549c049acc8a571c434088e692ca0c2ac0774e3b0c077694aef
+size 70421
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Creator-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Creator-iPad-en-GB.png
index eba7ad1bc..3f535f442 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Creator-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Creator-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3c58afaabd6ffc55dd12d3b697c7a37cc91b9e7658aa0b9bc92e43dfde210a7
-size 106956
+oid sha256:b90de9344ba0c01b5d445a394c5e38a989207ee7bc94fb8cde73287c6723c50b
+size 106910
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Creator-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Creator-iPad-pseudo.png
index cef0d5984..f95ebaebb 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Creator-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Creator-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5c2327860d7651c4afa2cf7ef8e9a9507226f2d9ffbcf5c9f68fa99bd6c4d7f7
-size 111706
+oid sha256:fed41cec4c1d2a3638d23e2e898fad9136528de58d31dca838a8b374e1598bd9
+size 111656
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Creator-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Creator-iPhone-en-GB.png
index 6e74425a2..d60f1c854 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Creator-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Creator-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bffc7cbfd5b6dac010dda670e804ad39fa145493e2f97195a4bf80348c8ed66
-size 58735
+oid sha256:af774461617f84946b23f5054872014e0ee7c43d42c032c18a21bf29caaacf3a
+size 58717
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Creator-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Creator-iPhone-pseudo.png
index ce1483e7a..8f6398c40 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Creator-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomRolesAndPermissionsScreen.Creator-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea5450e1f188e6a7fbe5ea7354bd7f9f5ed539393a2f72bad921f5f71901096f
-size 72173
+oid sha256:107fc8e3954ad925ea4cfab4165014aaabdfec89524c133a7d56078d17501016
+size 69344
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Both-setup-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Both-setup-iPad-en-GB.png
index 916c243b0..0421b14eb 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Both-setup-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Both-setup-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5547d393b03a085d5f16c6017e08bcd1f3b7ac857b0f82e6483af9cadf29612e
-size 134735
+oid sha256:ffe217161c94863d6c24e9de48700618b2eb2b9a55a27a518f02ed948cba0356
+size 134727
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Both-setup-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Both-setup-iPad-pseudo.png
index b5959af72..b8d0476a4 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Both-setup-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Both-setup-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a3aa556681b07b8b600f6192f4cfe178c531d8c8f01a7f60e1ef3ffa33b6cef
-size 167324
+oid sha256:9d8bf562f211f0ecaa1b27d23a9524f85a54c33f34d7e12423448a3ced135c22
+size 167124
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Both-setup-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Both-setup-iPhone-en-GB.png
index af8ec5e8c..e941a4b9e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Both-setup-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Both-setup-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c97cfd8f0dbe5cd2c71d064262ca13b5bdba84c901ee18b6ff37aef8b998111
-size 93114
+oid sha256:917ba93c3827ba6f4c3b7e53007fb6bf4bf4ab483076546c05c7408fe9fc97f9
+size 93112
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Both-setup-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Both-setup-iPhone-pseudo.png
index 2bfdc4807..808047b8a 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Both-setup-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Both-setup-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b521369d93ce2a686ec60265a57440cc6c588b101d16d2f1caefcd5ed8c410fe
-size 145084
+oid sha256:14308a739d63a789d32ebc41c248a7901785aab05ace5ee501c1fd37140ac123
+size 144437
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Only-key-backup-setup-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Only-key-backup-setup-iPad-en-GB.png
index 4974464e8..bc06e7e6e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Only-key-backup-setup-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Only-key-backup-setup-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e26bfeb1d3012326ab369c6fa9ab1701ed91f85af0ee232efabfdc085b348ee0
-size 133688
+oid sha256:d3e7e92690b3801a1b98d7e133bac892437a36e63e87d63c7ec43682934c9087
+size 133733
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Only-key-backup-setup-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Only-key-backup-setup-iPad-pseudo.png
index 39bc5d94b..ab8f192e9 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Only-key-backup-setup-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Only-key-backup-setup-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c73efb91e3ca8632f20faf021474c8c1b56da388bfdd8cd9c3248529f7b1fc25
-size 166370
+oid sha256:f0eec29c4512412c94a1968cd31326c5755ef9257745d6c940ec66083a423f70
+size 166497
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Only-key-backup-setup-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Only-key-backup-setup-iPhone-en-GB.png
index c3f0426d8..17da1680d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Only-key-backup-setup-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Only-key-backup-setup-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e362d5862bf5ec4086c0c5354938c15761abf9d7c4089d0cbdd29b6f2a576b3
-size 95220
+oid sha256:c73c5998e28de74649928491d39762e258192aab80a67fe13eea653bde8fd6e8
+size 94256
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Only-key-backup-setup-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Only-key-backup-setup-iPhone-pseudo.png
index 328232ab9..55256a643 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Only-key-backup-setup-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/secureBackupScreen.Only-key-backup-setup-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50f3725edb361cb53e4e042d54b20baa8d6a5833d1acf56fbb9e197d8a7496dc
-size 145455
+oid sha256:d854bf26d9dc54398a72ab3a5a3f3d214e2cac121ae18adcf70393e057ca46d5
+size 144049
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPad-en-GB.png
index 21e3aaeb3..ff2df8816 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3d488007d654fb8486781a8c3267ee6dbe37aeff9d711ffbf8315631971ddcd
-size 190528
+oid sha256:7dd1e0350e66a9d96b0e6366d30513542574f1fc55d6f1d1a82b01ea207454e3
+size 190599
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPad-pseudo.png
index d65ce2038..cf22f404a 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a548fb5456e80fb8186ed4c1e4adea01633d3e796756631f672d0df9a8eb11b5
-size 232850
+oid sha256:1ccc68345bf3c74fa4c55442fcf7ec9b511c3bd4e0361d5d6214f018314dfcf5
+size 232570
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPhone-en-GB.png
index f029b4a1d..d15f4c88d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eebfee6ec2d67b17adb898d08ef6426d13163bed3f9e7b7799bcbf75cbabae6e
-size 130523
+oid sha256:76597d6bbb8b593da8b433f85d062bd9c7cbdfa3ea222954fcfdb51992c22df4
+size 130521
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPhone-pseudo.png
index e7f09f5d0..adc925dfe 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-room-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f32f50751263435f47e959a9026f205393fab9ddea52d08027d10093b63d3852
-size 162283
+oid sha256:14e618d590a317092373a3f681551eb30ad16b94b009aace21abaf24d5090fc8
+size 162329
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-multiple-spaces-members-room-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-multiple-spaces-members-room-iPad-en-GB.png
index b4353045b..b5731e953 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-multiple-spaces-members-room-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-multiple-spaces-members-room-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe9769c920dce9cca6f9067961730f2e017f6da4e83c445e3f443fa1299399fd
-size 207300
+oid sha256:4fa111bdd0bef216f0c325a2acccd6c9c23d22f3cbf1f2ac48e16c3b20f0bc63
+size 207291
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-multiple-spaces-members-room-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-multiple-spaces-members-room-iPad-pseudo.png
index 819939677..b23eb4670 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-multiple-spaces-members-room-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-multiple-spaces-members-room-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4d07ad6251946cae5dff02c72e9c3ee4442a11196c68450d24c4d61e2ebab95
-size 253877
+oid sha256:a29d183b3e39207d4ce1f9c0326f864a3d39d9e2fd324d5081fca75148361f4d
+size 253888
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-multiple-spaces-members-room-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-multiple-spaces-members-room-iPhone-en-GB.png
index 134e8592b..c54b9287e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-multiple-spaces-members-room-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-multiple-spaces-members-room-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f5e954bf40040f28ec97bb58acdab0da86352cdbcebc644f8b679ffa476f9b1
-size 143789
+oid sha256:e5954d2ee92791c09a335a36cdc30b7f7c9702eb5a38e21af137e2aec5181068
+size 143762
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-multiple-spaces-members-room-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-multiple-spaces-members-room-iPhone-pseudo.png
index 4caaf92a6..f0cebd625 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-multiple-spaces-members-room-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-multiple-spaces-members-room-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d1aa389f69b4d48a99ce50ea5947a4b919f32b96b364e30f89c9928994f7239b
-size 176373
+oid sha256:15e9b7db2b57abf04132fc4a370e0c8d436e2df61430a2b4b7c2a438e0c1c773
+size 181158
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-single-space-members-room-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-single-space-members-room-iPad-en-GB.png
index b20787e9a..e7cefac62 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-single-space-members-room-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-single-space-members-room-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f435378013b1325a04ffbffa85ca764b2f7b8a31e4563588c44eb7f6ada40a70
-size 198765
+oid sha256:6e0a30dcd6d09b61a305850e900731df7f8ba763fb47bd7ccf14c16aa15e980c
+size 198791
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-single-space-members-room-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-single-space-members-room-iPad-pseudo.png
index bb16c47ae..357db5608 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-single-space-members-room-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-single-space-members-room-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76efd3a08c9bfe5f18a3902f6aac0bcc472a5aecca8aa24923931f105d5dd871
-size 237384
+oid sha256:e51c6b459b48439ed06ce37b3218906fdfa78e752138e3be755146886df73b59
+size 237232
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-single-space-members-room-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-single-space-members-room-iPhone-en-GB.png
index 658eaa586..d6e82d6d6 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-single-space-members-room-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-single-space-members-room-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5bcc9d9ea1a43abcda3314343164ef211ddd53073c3f45a02606487e9daa5bf
-size 133204
+oid sha256:59a179e4995fcf9c72abc55226c8b799ae36b88d55fe426e445c05ec8df4f984
+size 133214
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-single-space-members-room-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-single-space-members-room-iPhone-pseudo.png
index 1341cf6a5..2d832ab56 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-single-space-members-room-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Ask-to-join-with-single-space-members-room-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ecbcc4d35bd9a92e0cefac584977250f56782b045183f13b5d392b416bdb9463
-size 167954
+oid sha256:a0f15814cd64e4df6da8068eaaada40ca8b47416f9632ef2cf011a0c65cc4ba9
+size 166668
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Multiple-Spaces-members-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Multiple-Spaces-members-iPad-en-GB.png
index eb7aa4597..a35dcd9d7 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Multiple-Spaces-members-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Multiple-Spaces-members-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b19e5a03483e7aefc9d707ff835621e384effdef3a2f449f0c6343d3ea2728b0
-size 174013
+oid sha256:f6a27bd0cbc1a9bf611871dad7c1125158141b81f47779980716180f612be5c2
+size 174117
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Multiple-Spaces-members-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Multiple-Spaces-members-iPad-pseudo.png
index ff075be60..1474fad7a 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Multiple-Spaces-members-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Multiple-Spaces-members-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:811be1da4f53d2f2dc8eb046a3d8397e47400b69ed48bd4f6997a2afe55829ef
-size 213207
+oid sha256:994033d3a18d1d65f31dc97d38566f617ecfe48aaa823e8933ef4e6d679de4b4
+size 213224
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Multiple-Spaces-members-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Multiple-Spaces-members-iPhone-en-GB.png
index f37b8f0b2..f9bcb3ee9 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Multiple-Spaces-members-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Multiple-Spaces-members-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2540be4da1ed2910374b28a605444a6b0332200ce33fa411126c324acfd83de
-size 116005
+oid sha256:4c44836c263144aa3c41af6b39d36a7c23f91f7d72674f83e5eb736fbb8f6cff
+size 116004
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Multiple-Spaces-members-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Multiple-Spaces-members-iPhone-pseudo.png
index c6f9e3269..0ee6d6bbd 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Multiple-Spaces-members-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Multiple-Spaces-members-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c72a6be099b19cabbf8c6780fdf65e437a0cf6e6975fa984025f6acbd6a86238
-size 173973
+oid sha256:5a20761ff5e351d3640e05e4451ccdf73b37736047a1817394e2115bd48b77c8
+size 172952
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPad-en-GB.png
index 17ba3b8c1..c51ae5ff8 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8aa8e5df9b2514e23b8635ef2eb78438dcf2102a13fd9f86652a7cf5718c8489
-size 149453
+oid sha256:c59090ccc1e8aaff19d0a82d44149c1ff670371087a5bd2ed1c6ae2e1d4ef8d9
+size 149487
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPad-pseudo.png
index f6f5e0bd8..cfd5adf79 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc8cb589e9ad4f67171d5c90e5015ebbaf52279925fe7993d5745b840695d8f4
-size 174554
+oid sha256:4172523a05ff6cf131af0e92a1570a9cf45f53fdf5748d4d2591750cea783294
+size 174566
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPhone-en-GB.png
index 61f7531f7..a797efd4d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:900a688bbc640b86f1a3a8194fa1e9058f45c48ac88903217721b8fe91fc5cf4
-size 91396
+oid sha256:fa442467bd8ebba3111faab5ee9a2626176af853c9ecae72ac4b1d2817612974
+size 91420
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPhone-pseudo.png
index 3caa002dc..6e6941a85 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Private-invite-only-room-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:334f7372e4f75ee6eec6843ada78099406c58e67eee38ca9ec9020bdb82b7070
-size 131337
+oid sha256:ec0a47eb40a81dcd07e17326e51ab4d9aff3e80399e7771ae1bda180ee7a156c
+size 131380
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPad-en-GB.png
index d1b6d86e9..c4147648e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d9ed9429dd57043be3fb057852651e5eef19060d9d1341398fe5c0e04429fcec
-size 200515
+oid sha256:a820da1eb2ba4fb0e7c80164de87e0075b6c7136018d9adebf0d95d06e13f3ac
+size 200592
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPad-pseudo.png
index 1157b87fb..d5d2b7066 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90ebf7970b562dae41e20bee0927338c4681db56e2476e91d30f99c1f7ad3562
-size 230032
+oid sha256:7144fecd4caf13fb50f5032b6ba4f9441959265d6080c45b2804885426770002
+size 230071
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPhone-en-GB.png
index b59abe919..084dddf27 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a68e95578e02b22068aac0ddce87aae6fe7b0c0524c3e1ebca3e0cbd848e9676
-size 133202
+oid sha256:7a373177ede337e3c6e4ffc9b66d4623983d786fdf197effc5892d87ceb111a2
+size 132993
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPhone-pseudo.png
index a70a94b25..ef4847526 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59a4af3fb36d9989603c25a9aa19b8af8226a74b1c7e8014936993488252b4a7
-size 167845
+oid sha256:79a747bbd2f6ad0865b92ae44693be6d287b9e3790124ce7c20f69dc67cbceab
+size 167853
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPad-en-GB.png
index 3e3349a5f..e66aea315 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:800af9e73485bcff3fded4ce979ed520d5a73256313fde1da488ea22d1b81adf
-size 171894
+oid sha256:c5fb3c60046d2bcb743ca340dec9fa13feeb9f24f80f10a775fd01c158070f5b
+size 171994
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPad-pseudo.png
index a4e28a4ba..b767e90c4 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58644aec797e73c4b441834090b9dd186845e9ee96a5e5bc3ac1e3592c1f3ae5
-size 208381
+oid sha256:3618b9084671c650c2448b7e595e353ab61549d1602e30ca492e0d4eb3849b86
+size 208420
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPhone-en-GB.png
index f5eba68df..96e72224d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2bf5e32c301ac1f164834082d1cca2126114bf1bb69e4e476dc09adba690f419
-size 114303
+oid sha256:8267f6f2d99cbf63c1d416ed0b109b443f3944a6e11292dd2503bda759370f33
+size 114090
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPhone-pseudo.png
index 74e5be4a1..705a5ff04 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-room-without-address-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d14201f10c7c8631c0250028a7b3a2cd59ee7375df695909103ac182373d19a
-size 152404
+oid sha256:8d747cccc0170192a7b03528df274f237b2a4f0e857325ad5a0f86511c3e9ca4
+size 152413
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPad-en-GB.png
index 5838dde90..2a3d810f6 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4ea2ae5494cc3bb72dca80989d3c15a02188d7f512c94f2f978a7269577880d
-size 152991
+oid sha256:eb97e8e57c8541fa7a2e024fff2c4f65423f2d656640e3e5c0caef571ac2e1ba
+size 153069
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPad-pseudo.png
index c255b8674..15e08714f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60e83e63127873b2b2315bb9ce08efac78854d3165939627386977a3ed77cb21
-size 181327
+oid sha256:024bb2964f9762db68853de97a3af568c9e8561f55626136db0c20ddef37511b
+size 181366
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPhone-en-GB.png
index a92839d1e..57f3a392e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1560239dc4f9b80d88c53365b985f8034158e9453a6801100a2bab812b71cc02
-size 103375
+oid sha256:40fa157ce0f8d1144e147f675eef32ba155a22c62410cd3ee59da41381808d0c
+size 103166
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPhone-pseudo.png
index f9373a823..b8992e9cf 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Public-space-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c377d2140aab2d9c3e9a76117cc0e54aeccb7217367ef31f0c0902e39321217
-size 145657
+oid sha256:5b999570c0e31157fac4c8f81180f86b7b6cbbc8d7322c19eca0cdc948c8e363
+size 145665
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Space-members-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Space-members-iPad-en-GB.png
index 4c5cc6c3d..23d56b4f6 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Space-members-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Space-members-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97f4288dc81c9f620f7f10a3252635766cfad74b529ede213f85925797aae86f
-size 159645
+oid sha256:7a268363fa16d2a651d05be5ebb4e8bd59a12211dc20d82cde4ad1f316f20fc6
+size 159862
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Space-members-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Space-members-iPad-pseudo.png
index 6347eaafb..f2e46fb1f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Space-members-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Space-members-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5ba0229f997096a9e6c3aabd7ed11d9dee55ed9512550564223d48a945ef238
-size 188778
+oid sha256:f28826f1c0f42daaa8d09c5a47fcecbee85fc556ede7a104bcc856b2431dbdd2
+size 188803
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Space-members-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Space-members-iPhone-en-GB.png
index c59456f8e..c8b52eebf 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Space-members-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Space-members-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c04e4b9c1e94306947e295a419cf37e46c2fd43de8f81ff320a2288ae1c2bd45
-size 102567
+oid sha256:14dd1f48508dc6942d38bc0f88f5b4fe97dd6616bad28b37378b96675282d4e6
+size 102616
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Space-members-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Space-members-iPhone-pseudo.png
index 7a0e28659..671e3f568 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Space-members-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/securityAndPrivacyScreen.Space-members-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2223287b0fd17104d6f0a798b22b5d87c3b0f8eae99da86f83096f0a9e9ca4e3
-size 150113
+oid sha256:146c5a019ea495a88a4d0e5a2d7c92cd78d34cb0422b4d2dd82ab60174e63e10
+size 148248
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/serverConfirmationScreen.Picker-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/serverConfirmationScreen.Picker-iPad-en-GB.png
index 37922209d..5f23671bd 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/serverConfirmationScreen.Picker-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/serverConfirmationScreen.Picker-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d02fabc07c53218fcf882cbb836d5545ea3c2e025dfabee4e91debedb112c771
-size 112388
+oid sha256:1a8f9b19e48979489ecd1f85b0d4e269a6c71d1b0914b6bef4edcc5b80e7196b
+size 112550
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/serverConfirmationScreen.Picker-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/serverConfirmationScreen.Picker-iPad-pseudo.png
index daf57eb6d..08bb70bea 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/serverConfirmationScreen.Picker-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/serverConfirmationScreen.Picker-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63753f61deb94d782ac028a60d520563aca24e8d80d8023ec4d9bc9b3a03d00e
-size 114259
+oid sha256:13215b8b562300a91e14cb299a90632f0755a041e7876a0d332ffc1c32459306
+size 114426
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/serverConfirmationScreen.Picker-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/serverConfirmationScreen.Picker-iPhone-en-GB.png
index f8c513c5a..40310818d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/serverConfirmationScreen.Picker-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/serverConfirmationScreen.Picker-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3515cb4d59af7cbe5a136b3edbed731dbccbf2bc021208ae2eec4194905068c
-size 60990
+oid sha256:f42c0c369f36a86708c5b95cf26aa99c8400cb1810bfe6077395dd8f2d17f0ef
+size 60925
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/serverConfirmationScreen.Picker-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/serverConfirmationScreen.Picker-iPhone-pseudo.png
index 6da1cc715..1cd62d70b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/serverConfirmationScreen.Picker-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/serverConfirmationScreen.Picker-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24ebc7785c14c5a43e7ea040bbac9a0ec6bb0c5d0b3cace9ce76d05f1d216dc5
-size 70082
+oid sha256:d42afd834e3832731c803923520cc33b869946f38990c57dbf70064ed0b4d691
+size 70052
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPad-en-GB.png
index 9d040c75d..6f7cd5e2e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32c75e2415e857f8d5c793848e1e736a46149ecc167b31ddd1612af3c28abbef
-size 148934
+oid sha256:f2d77bf89b1d8f32769fb344350d506385d285b8243d2e68e6a927526ec859f6
+size 148915
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPad-pseudo.png
index 9f5567314..781cafd9b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43230ecb31ef999b668fe6e50ab9147d433495c1cceae39be7e880e4ffdd12f0
-size 155012
+oid sha256:be915ee13c944b772a0e57afebc00a89c025da30a2b9752f63355d439da7cddb
+size 155044
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPhone-en-GB.png
index e2a7328cf..46de59b71 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a012c7a9faa12943e8969428c92c1afcce2d354eab60154e0337d95fb581d439
-size 95671
+oid sha256:a05f66738a862f6131e63903c87c9b1b94dfdf0a64cbb222185c30dc13d76dc3
+size 95770
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPhone-pseudo.png
index 8d1fcf569..8cc3d2390 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Bug-report-disabled-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8fb65ac4a77735e912615243b1c47fdddebc92ef0f52219629cec61f00c0147e
-size 112072
+oid sha256:504ba2c922526a08812f1df453b7a3f7edb56c3e78666d75272f6da887965926
+size 111928
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Default-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Default-iPad-en-GB.png
index 591fa1576..8a948c84e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Default-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Default-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bdc37bf1592830a0d05c79f3582ac588299a0a0975e035acb87f5eb0a9220a1d
-size 149210
+oid sha256:e580af0e0cd966cf0fecec76f46412cfc258e7d2f354c3b9d0a08c072cef0a4b
+size 149158
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Default-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Default-iPad-pseudo.png
index 0bbd0fc25..14fc98e7c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Default-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Default-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be3c3ddcf762d96a94522322fa3648a848736f9926c1a6df8d99d67122171ee8
-size 155289
+oid sha256:a2e654f118059094b2245e8e6574a1c26b9debdc470453e938e27fed680f799c
+size 155305
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Default-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Default-iPhone-en-GB.png
index 2cdf4bac1..c31e59731 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Default-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Default-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06a1b393713fd6cf51e3e85bf1d677d9cee7d597c750adc72743321c02f92dc5
-size 96006
+oid sha256:fd8270f52ee525489e71ecdb3eefaf07879654d71adfccb71fe018fd8a3f01a6
+size 96176
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Default-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Default-iPhone-pseudo.png
index 5ed2454b7..7733e612f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Default-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/settingsScreen.Default-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6109e32c9651f2e2a45e8a41d535e6b8ee5787489ab82a8fc26b0e14ae45917c
-size 115405
+oid sha256:b067e9231ded487380ca1bc6af2d17410fcabf349afb7fc81fd0ae9cf0fb7c04
+size 115309
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.Owner-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.Owner-iPad-en-GB.png
index 2ef265f2b..ec3a8cb74 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.Owner-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.Owner-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cfbe3227b3d1a483411782585f922bb61055d8eae998d1fb3db86a8286b5aabd
-size 143669
+oid sha256:2040030d8058d4dead74cbb3f57f77f1d62a2fc1bfeaa43784dc6052b959608a
+size 143632
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.Owner-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.Owner-iPad-pseudo.png
index 08aeae200..b05a6c3b5 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.Owner-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.Owner-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f6e9013c6adc0e1e8e1cb37b815df345b32d7688e0bb32d3225090032c204d4
-size 147402
+oid sha256:a5fe5da88e8ba2d535d2eea7d72ccf16519de45acbe15cdf908a8bf19ef9298a
+size 147386
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.Owner-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.Owner-iPhone-en-GB.png
index fc5dedc2c..f68d029fb 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.Owner-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.Owner-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a5e87c096707610e396e93adbcd42b7437ada752954d53317277587dbc1e249
-size 92240
+oid sha256:fd9959fb3d9f79bc41a339090466e1337e93034f32e04a138b33668a9b299520
+size 92181
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.Owner-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.Owner-iPhone-pseudo.png
index c60917882..4a7fc38b0 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.Owner-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.Owner-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a2696daa8ca4381e132ea82f8a48f0c7c84af8490fce448a7c0b68fc4c50718
-size 104855
+oid sha256:c12401f8b81decf78c347dac74056dac703776ce8a182cbfc083904516f7d4a6
+size 104774
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.User-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.User-iPad-en-GB.png
index 3fc3a35af..f88fcd5c6 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.User-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.User-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:585bed2c42ed2e0bd625e0b25e4e71496aefc726bcc820fab606319181992281
-size 128369
+oid sha256:50a9d6101bd6b6bc15cbe1435d43d37eb774dacf72f321175fa1a5e60d29d6a7
+size 128328
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.User-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.User-iPad-pseudo.png
index 62f38db0d..74bef2ee7 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.User-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.User-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:192552fe20804f7de88bb8320fb6d47b436de1faa8c3f0ba78dddd2718a77e1a
-size 130572
+oid sha256:27fb0817fb218ca880438fe42c868a4435bfaf057511046850dbb345bbe947d3
+size 130523
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.User-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.User-iPhone-en-GB.png
index 98f697445..d99fb7afa 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.User-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.User-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a5d9653c5aaa97b67bfdcfbd82b59c2a9e0f123f8214441c763d08b0c8b08299
-size 77614
+oid sha256:7d5f846787dc0d2add906a7001032d0671a5d5eb580e6f13b42609a1d359f020
+size 77552
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.User-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.User-iPhone-pseudo.png
index 45d5d820c..4d93ab79f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.User-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/spaceSettingsScreen.User-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7bbd4e9eed3dc5e3d86e9a7eb86f8a35f07a7573b8050f7c7c5394881b324486
-size 81428
+oid sha256:e4dbd2815c1245ff4f0b75a1a418133ff259c34984d428083995e986887d288a
+size 81400
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/startChatScreen.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/startChatScreen.iPad-en-GB-0.png
index 6062c26b9..786049701 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/startChatScreen.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/startChatScreen.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bac263f93f7b7e779f2b0e321e2bfe6ecfa8bf7beb63401c420fb788942c9b35
-size 110570
+oid sha256:04e9750ec744670c4faba261d443790e3072c9af63689396342342a0525667a7
+size 110596
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/startChatScreen.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/startChatScreen.iPad-pseudo-0.png
index 67502870d..99306e745 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/startChatScreen.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/startChatScreen.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc03b4a2cb5c5bdfd19c1f24f89a7d24a14387bea479da5a58f4e5b4cc3912a1
-size 117827
+oid sha256:9f5195d5984d533b9172ed538494c70f084376f3a9431d44b0fb4edc0cbf2ade
+size 117864
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/startChatScreen.iPhone-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/startChatScreen.iPhone-en-GB-0.png
index 2d9b2815d..ce1aa4e26 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/startChatScreen.iPhone-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/startChatScreen.iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f232c3794cd67640c5eba4c271b31acff3a5ab1272b6364d32a663f6af18243d
-size 61370
+oid sha256:a136a79acfb2babb6721fa0b3ed7dbd73df951b94947ae589d5345e14c1594a0
+size 61418
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/startChatScreen.iPhone-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/startChatScreen.iPhone-pseudo-0.png
index c0d41672f..b95f58d14 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/startChatScreen.iPhone-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/startChatScreen.iPhone-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c90029600715f6d9d21a504ca9f80c71b2e30a7fc12345ac8c004a1b314d7e1
-size 76083
+oid sha256:2f1dda0334ea93e380400a0dc9441e2d10a64217a2d17c2d2ecb7755463e710a
+size 76113
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-0.png
index f15a3caf3..6912bb000 100644
--- a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-0.png
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e969a1ccdc39baf54af1c56a91e296d548c03db03cca95b57354fcdcadd45f60
-size 159763
+oid sha256:9979c9d24f20dc3e01767f7f971c06cb18fd985bc5dfdd29bdafe9d21aca35d3
+size 159625
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-en-GB-0.png
index ec1432d11..10af2cd68 100644
--- a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-en-GB-0.png
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e7fcb10023da9a151d86117cd2cbd2f51f6febd46115be0500e08e143b90182
-size 159766
+oid sha256:5c5ca3980e7874e8f1c567036797dd0078a12efd0002525dfa91991cfe8d3473
+size 159608
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-en-GB-0.png
index e6f5310ba..fb11b4cc0 100644
--- a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-en-GB-0.png
+++ b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06199407d20124a5a05db8668e29f65d3f951e9e2692a63be71c6da0b61dbeb9
-size 115835
+oid sha256:b319b46c02e1fe3d19958630fc15b939f87c2b10058340ed605e103c77611c11
+size 115845
diff --git a/compound-ios/Sources/Compound/List/ListRowLabel.swift b/compound-ios/Sources/Compound/List/ListRowLabel.swift
index 6eea34bb9..923604ec7 100644
--- a/compound-ios/Sources/Compound/List/ListRowLabel.swift
+++ b/compound-ios/Sources/Compound/List/ListRowLabel.swift
@@ -51,7 +51,7 @@ struct ListRowAvatarLabelStyle: LabelStyle {
 public struct ListRowLabel<Icon: View>: View {
     @Environment(\.isEnabled) private var isEnabled
     @Environment(\.lineLimit) private var lineLimit
-    @ScaledMetric private var iconSize = 30.0
+    @ScaledMetric private var iconSize = Compound.supportsGlass ? CompoundIcon.Size.medium.value : 30 // Pre-iOS 26 includes space for a background.
     
     var title: String?
     var status: String?
@@ -145,10 +145,10 @@ public struct ListRowLabel<Icon: View>: View {
         } icon: {
             icon
                 .foregroundColor(iconForegroundColor)
-                .frame(width: iconSize, height: iconSize)
+                .frame(width: iconSize, height: iconSize) // Can be removed when dropping support for iOS 18.
                 .background(iconBackgroundColor)
-                .clipShape(RoundedRectangle(cornerRadius: 8))
-                .padding(.vertical, -4) // Don't allow the background to size the row.
+                .clipShape(RoundedRectangle(cornerRadius: Compound.supportsGlass ? 0 : 8))
+                .padding(.vertical, Compound.supportsGlass ? -1 : -4) // Don't allow the background to size the row.
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .leading)
         .labelStyle(ListRowLabelStyle(iconAlignment: iconAlignment))
diff --git a/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/compoundIcon.Form-iPad-en-US.png b/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/compoundIcon.Form-iPad-en-US.png
index 11d6ced0f..96aaea413 100644
--- a/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/compoundIcon.Form-iPad-en-US.png
+++ b/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/compoundIcon.Form-iPad-en-US.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b2cc1664c0b1c6cdbd6f9c1c6bed9be8c0eace88767d75de4518eaafaa738f6
-size 95676
+oid sha256:08815317819ffaa53aaf3a57c0d77faf83982c0f0995b531b29d65205ecf23f2
+size 95605
diff --git a/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/compoundIcon.Form-iPhone-en-US.png b/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/compoundIcon.Form-iPhone-en-US.png
index 05f643353..51556b514 100644
--- a/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/compoundIcon.Form-iPhone-en-US.png
+++ b/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/compoundIcon.Form-iPhone-en-US.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e054734b5467b099c7a90b6e0de2de5199f029481e451747368b0723ac7017cf
-size 49130
+oid sha256:f3bdd49d8c0a83aecaa6abfc6e19b1e7ce28410e9b59b8aecfeacb589365a424
+size 49205
diff --git a/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRow.iPad-en-US-0.png b/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRow.iPad-en-US-0.png
index b2236c547..f2e83b890 100644
--- a/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRow.iPad-en-US-0.png
+++ b/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRow.iPad-en-US-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:142ab36fd7249a84438bfc018416003e742b503e9d6bcc1f4c8c15cb8d2b9a38
-size 384757
+oid sha256:0624e48ac16514442e5154c1f17de0cc0469013e6d31adf6dcc2c4ceb33c61e8
+size 384855
diff --git a/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRow.iPhone-en-US-0.png b/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRow.iPhone-en-US-0.png
index 736cb73a4..6d715e395 100644
--- a/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRow.iPhone-en-US-0.png
+++ b/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRow.iPhone-en-US-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:79d20d415284f9b8760ceb126266d11c7fd274e4c8920bd8eba5ead6423f0a1f
-size 255299
+oid sha256:34f7a6dd90a0368517ff51f341fb78d9ad3a002f6715a0b2f83e209c90d544e9
+size 258128
diff --git a/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRowLabel.iPad-en-US-0.png b/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRowLabel.iPad-en-US-0.png
index d19332e50..306b42cae 100644
--- a/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRowLabel.iPad-en-US-0.png
+++ b/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRowLabel.iPad-en-US-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0aa22ee7c209c04193276c38e59b47990ae8bf76dab79ac56b48795f15394cf9
-size 190065
+oid sha256:87a1d5fcd870f54b9d3ab6a85a2b4a57453d2ee4ca9cfde85e88edc470582c3e
+size 189991
diff --git a/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRowLabel.iPhone-en-US-0.png b/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRowLabel.iPhone-en-US-0.png
index 90d8fecad..ff6f1ff97 100644
--- a/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRowLabel.iPhone-en-US-0.png
+++ b/compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRowLabel.iPhone-en-US-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca6a9588adec7a1cd3f06db5186415eba359cfe3b5a2753cf366bb3a76c0dfcf
-size 132057
+oid sha256:69a7eea88ff74ca88b49b4c2f30a0d0d639c81d9d9d9701abcbd1039ed661523
+size 132964