diff --git a/.swiftlint.yml b/.swiftlint.yml
index 1166ea1f5..9fc47262c 100755
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -49,6 +49,18 @@ nesting:
     warning: 5
 
 custom_rules:
+  vstack_spacing:
+    regex: "(?-s)VStack((?!spacing:).)*\\s*\\{"
+    match_kinds: identifier
+    message: "Please use explicit spacing in VStacks."
+    severity: warning
+
+  hstack_spacing:
+    regex: "(?-s)HStack((?!spacing:).)*\\s*\\{"
+    match_kinds: identifier
+    message: "Please use explicit spacing in HStacks."
+    severity: warning
+
   print_deprecation:
     regex: "\\b(print)\\b"
     match_kinds: identifier
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 36b4e6dcd..59d0f3c26 100644
--- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -263,7 +263,7 @@
     {
       "identity" : "swiftui-introspect",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/siteline/SwiftUI-Introspect.git",
+      "location" : "https://github.com/siteline/SwiftUI-Introspect",
       "state" : {
         "revision" : "b94da693e57eaf79d16464b8b7c90d09cba4e290",
         "version" : "0.9.2"
diff --git a/ElementX/Sources/Other/MapLibre/MapLibreStaticMapView.swift b/ElementX/Sources/Other/MapLibre/MapLibreStaticMapView.swift
index c078a97b1..5f2365937 100644
--- a/ElementX/Sources/Other/MapLibre/MapLibreStaticMapView.swift
+++ b/ElementX/Sources/Other/MapLibre/MapLibreStaticMapView.swift
@@ -86,7 +86,7 @@ struct MapLibreStaticMapView<PinAnnotation: View>: View {
         } label: {
             placeholderImage
                 .overlay {
-                    VStack {
+                    VStack(spacing: 0) {
                         Image(systemName: "arrow.clockwise")
                         Text(L10n.actionStaticMapLoad)
                     }
diff --git a/ElementX/Sources/Other/SwiftUI/Animation/ShimmerModifier.swift b/ElementX/Sources/Other/SwiftUI/Animation/ShimmerModifier.swift
index 7c59a4e82..f9fa0ca5b 100644
--- a/ElementX/Sources/Other/SwiftUI/Animation/ShimmerModifier.swift
+++ b/ElementX/Sources/Other/SwiftUI/Animation/ShimmerModifier.swift
@@ -87,7 +87,7 @@ struct ShimmerOverlay_Previews: PreviewProvider, TestablePreview {
                                                userIndicatorController: ServiceLocator.shared.userIndicatorController)
     
     static var previews: some View {
-        VStack {
+        VStack(spacing: 0) {
             ForEach(0...8, id: \.self) { _ in
                 HomeScreenRoomCell(room: .placeholder(), context: viewModel.context, isSelected: false)
             }
diff --git a/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift b/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift
index 391f449c5..860a7988a 100644
--- a/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift	
+++ b/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift	
@@ -97,7 +97,7 @@ struct FormButtonStyle: PrimitiveButtonStyle {
         var accessory: FormRowAccessory?
         
         func makeBody(configuration: Configuration) -> some View {
-            HStack {
+            HStack(spacing: 8) {
                 configuration.label
                     .labelStyle(FormRowLabelStyle(role: configuration.role))
                     .foregroundColor(.compound.textPrimary)
@@ -126,7 +126,7 @@ struct FormActionButtonStyle: ButtonStyle {
     let title: String
     
     func makeBody(configuration: Configuration) -> some View {
-        VStack {
+        VStack(spacing: 8) {
             configuration.label
                 .buttonStyle(.plain)
                 .foregroundColor(.compound.textPrimary)
diff --git a/ElementX/Sources/Other/SwiftUI/Form Styles/FormRowLabelStyle.swift b/ElementX/Sources/Other/SwiftUI/Form Styles/FormRowLabelStyle.swift
index c0d0cd4b1..87c224f8f 100644
--- a/ElementX/Sources/Other/SwiftUI/Form Styles/FormRowLabelStyle.swift	
+++ b/ElementX/Sources/Other/SwiftUI/Form Styles/FormRowLabelStyle.swift	
@@ -61,7 +61,7 @@ struct FormRowLabelStyle: LabelStyle {
 
 struct FormRowLabelStyle_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
-        VStack(alignment: .leading) {
+        VStack(alignment: .leading, spacing: 12) {
             Label("Person", systemImage: "person")
                 .labelStyle(FormRowLabelStyle())
             
diff --git a/ElementX/Sources/Other/SwiftUI/Layout/FullscreenDialog.swift b/ElementX/Sources/Other/SwiftUI/Layout/FullscreenDialog.swift
index bd9cb63ac..86edb78ff 100644
--- a/ElementX/Sources/Other/SwiftUI/Layout/FullscreenDialog.swift
+++ b/ElementX/Sources/Other/SwiftUI/Layout/FullscreenDialog.swift
@@ -50,7 +50,7 @@ struct FullscreenDialog<Content: View, BottomContent: View>: View {
     var standardLayout: some View {
         GeometryReader { geometry in
             ScrollView {
-                VStack {
+                VStack(spacing: 0) {
                     Spacer()
                         .frame(height: UIConstants.spacerHeight(in: geometry))
                     
@@ -62,7 +62,7 @@ struct FullscreenDialog<Content: View, BottomContent: View>: View {
             }
             .scrollBounceBehavior(.basedOnSize)
             .safeAreaInset(edge: .bottom) {
-                VStack {
+                VStack(spacing: 0) {
                     bottomContent()
                         .readableFrame()
                         .padding(.horizontal, horizontalPadding)
@@ -81,7 +81,7 @@ struct FullscreenDialog<Content: View, BottomContent: View>: View {
     var accessibilityLayout: some View {
         GeometryReader { geometry in
             ScrollView {
-                VStack {
+                VStack(spacing: 0) {
                     Spacer()
                         .frame(height: UIConstants.spacerHeight(in: geometry))
                     
diff --git a/ElementX/Sources/Other/UserIndicator/UserIndicatorModalView.swift b/ElementX/Sources/Other/UserIndicator/UserIndicatorModalView.swift
index f40a388c6..24fc26480 100644
--- a/ElementX/Sources/Other/UserIndicator/UserIndicatorModalView.swift
+++ b/ElementX/Sources/Other/UserIndicator/UserIndicatorModalView.swift
@@ -30,7 +30,7 @@ struct UserIndicatorModalView: View {
                     ProgressView(value: progressFraction)
                 }
 
-                HStack {
+                HStack(spacing: 8) {
                     if let iconName = indicator.iconName {
                         Image(systemName: iconName)
                             .font(.compound.bodyLG)
diff --git a/ElementX/Sources/Other/VoiceMessage/EstimatedWaveformView.swift b/ElementX/Sources/Other/VoiceMessage/EstimatedWaveformView.swift
index 4ae87feab..844d329d5 100644
--- a/ElementX/Sources/Other/VoiceMessage/EstimatedWaveformView.swift
+++ b/ElementX/Sources/Other/VoiceMessage/EstimatedWaveformView.swift
@@ -124,7 +124,7 @@ private struct WaveformShape: Shape {
 struct EstimatedWaveformView_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
         // Wrap the WaveformView in a VStack otherwise the preview test will fail (because of Prefire / GeometryReader)
-        VStack {
+        VStack(spacing: 0) {
             EstimatedWaveformView(waveform: EstimatedWaveform.mockWaveform, progress: 0.5)
                 .frame(width: 140, height: 50)
         }
diff --git a/ElementX/Sources/Other/VoiceMessage/VoiceMessageButton.swift b/ElementX/Sources/Other/VoiceMessage/VoiceMessageButton.swift
index e3436e4a2..ac23054d5 100644
--- a/ElementX/Sources/Other/VoiceMessage/VoiceMessageButton.swift
+++ b/ElementX/Sources/Other/VoiceMessage/VoiceMessageButton.swift
@@ -110,12 +110,12 @@ extension VoiceMessageButton.State {
 
 struct VoiceMessageButton_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
-        VStack {
-            HStack {
+        VStack(spacing: 8) {
+            HStack(spacing: 8) {
                 VoiceMessageButton(state: .paused, size: .small, action: { })
                 VoiceMessageButton(state: .paused, size: .medium, action: { })
             }
-            HStack {
+            HStack(spacing: 8) {
                 VoiceMessageButton(state: .playing, size: .small, action: { })
                 VoiceMessageButton(state: .playing, size: .medium, action: { })
             }
diff --git a/ElementX/Sources/Screens/AppLock/AppLockSetupPINScreen/View/PINTextField.swift b/ElementX/Sources/Screens/AppLock/AppLockSetupPINScreen/View/PINTextField.swift
index e7a23109c..e086a9b64 100644
--- a/ElementX/Sources/Screens/AppLock/AppLockSetupPINScreen/View/PINTextField.swift
+++ b/ElementX/Sources/Screens/AppLock/AppLockSetupPINScreen/View/PINTextField.swift
@@ -102,7 +102,7 @@ private struct PINDigitField: View {
 
 struct PINTextField_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
-        VStack {
+        VStack(spacing: 8) {
             PreviewWrapper(pinCode: "", isSecure: false)
             PreviewWrapper(pinCode: "12", isSecure: false)
             PreviewWrapper(pinCode: "1234", isSecure: false)
diff --git a/ElementX/Sources/Screens/ComposerToolbar/View/CompletionSuggestionView.swift b/ElementX/Sources/Screens/ComposerToolbar/View/CompletionSuggestionView.swift
index 6d9f0e69a..044e86dc2 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/View/CompletionSuggestionView.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/View/CompletionSuggestionView.swift
@@ -123,12 +123,12 @@ struct CompletionSuggestion_Previews: PreviewProvider, TestablePreview {
     
     static var previews: some View {
         // Putting them is VStack allows the preview to work properly in tests
-        VStack {
+        VStack(spacing: 8) {
             CompletionSuggestionView(imageProvider: MockMediaProvider(),
                                      items: [.user(item: MentionSuggestionItem(id: "@user_mention_1:matrix.org", displayName: "User 1", avatarURL: nil)),
                                              .user(item: MentionSuggestionItem(id: "@user_mention_2:matrix.org", displayName: "User 2", avatarURL: URL.documentsDirectory))]) { _ in }
         }
-        VStack {
+        VStack(spacing: 8) {
             CompletionSuggestionView(imageProvider: MockMediaProvider(),
                                      items: multipleItems) { _ in }
         }
diff --git a/ElementX/Sources/Screens/ComposerToolbar/View/ComposerToolbar.swift b/ElementX/Sources/Screens/ComposerToolbar/View/ComposerToolbar.swift
index f324e98de..f7b2b13f4 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/View/ComposerToolbar.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/View/ComposerToolbar.swift
@@ -299,7 +299,7 @@ struct ComposerToolbar_Previews: PreviewProvider, TestablePreview {
         ComposerToolbar.mock(focused: true)
         
         // Putting them is VStack allows the completion suggestion preview to work properly in tests
-        VStack {
+        VStack(spacing: 8) {
             // The mock functon can't be used in this context because it does not hold a reference to the view model, losing the combine subscriptions
             ComposerToolbar(context: composerViewModel.context,
                             wysiwygViewModel: wysiwygViewModel,
@@ -307,7 +307,7 @@ struct ComposerToolbar_Previews: PreviewProvider, TestablePreview {
         }
         .previewDisplayName("With Suggestions")
         
-        VStack {
+        VStack(spacing: 8) {
             ComposerToolbar.textWithVoiceMessage(focused: false)
             ComposerToolbar.textWithVoiceMessage(focused: true)
             ComposerToolbar.voiceMessageRecordingMock(recording: true)
diff --git a/ElementX/Sources/Screens/ComposerToolbar/View/MessageComposer.swift b/ElementX/Sources/Screens/ComposerToolbar/View/MessageComposer.swift
index b97d41824..c61184c18 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/View/MessageComposer.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/View/MessageComposer.swift
@@ -154,7 +154,7 @@ private struct MessageComposerEditHeader: View {
     let action: () -> Void
     
     var body: some View {
-        HStack(alignment: .center) {
+        HStack(alignment: .center, spacing: 8) {
             Label(L10n.commonEditing,
                   iconAsset: Asset.Images.editing,
                   iconSize: .xSmall,
@@ -227,7 +227,7 @@ struct MessageComposer_Previews: PreviewProvider, TestablePreview {
     }
 
     static var previews: some View {
-        VStack {
+        VStack(spacing: 8) {
             messageComposer(sendingDisabled: true)
 
             messageComposer("Some message",
@@ -240,7 +240,7 @@ struct MessageComposer_Previews: PreviewProvider, TestablePreview {
         .padding(.horizontal)
 
         ScrollView {
-            VStack {
+            VStack(spacing: 8) {
                 ForEach(replyTypes, id: \.self) { replyDetails in
                     messageComposer(mode: .reply(itemID: .random,
                                                  replyDetails: replyDetails, isThread: false))
@@ -252,7 +252,7 @@ struct MessageComposer_Previews: PreviewProvider, TestablePreview {
         .previewDisplayName("Replying")
         
         ScrollView {
-            VStack {
+            VStack(spacing: 8) {
                 ForEach(replyTypes, id: \.self) { replyDetails in
                     messageComposer(mode: .reply(itemID: .random,
                                                  replyDetails: replyDetails, isThread: true))
diff --git a/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessagePreviewComposer.swift b/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessagePreviewComposer.swift
index 411831b41..900561bd8 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessagePreviewComposer.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessagePreviewComposer.swift
@@ -41,18 +41,16 @@ struct VoiceMessagePreviewComposer: View {
     }
     
     var body: some View {
-        HStack {
-            HStack {
-                VoiceMessageButton(state: .init(playerState.playerButtonPlaybackState),
-                                   size: .small,
-                                   action: onPlayPause)
-                Text(timeLabelContent)
-                    .lineLimit(1)
-                    .font(.compound.bodySMSemibold)
-                    .foregroundColor(.compound.textSecondary)
-                    .monospacedDigit()
-                    .fixedSize(horizontal: true, vertical: true)
-            }
+        HStack(spacing: 8) {
+            VoiceMessageButton(state: .init(playerState.playerButtonPlaybackState),
+                               size: .small,
+                               action: onPlayPause)
+            Text(timeLabelContent)
+                .lineLimit(1)
+                .font(.compound.bodySMSemibold)
+                .foregroundColor(.compound.textSecondary)
+                .monospacedDigit()
+                .fixedSize(horizontal: true, vertical: true)
 
             waveformView
                 .waveformInteraction(isDragging: $isDragging,
@@ -130,9 +128,7 @@ struct VoiceMessagePreviewComposer_Previews: PreviewProvider, TestablePreview {
     static let waveformData: [Float] = Array(repeating: 1.0, count: 1000)
     
     static var previews: some View {
-        VStack {
-            VoiceMessagePreviewComposer(playerState: playerState, waveform: .data(waveformData), onPlay: { }, onPause: { }, onSeek: { _ in }, onScrubbing: { _ in })
-                .fixedSize(horizontal: false, vertical: true)
-        }
+        VoiceMessagePreviewComposer(playerState: playerState, waveform: .data(waveformData), onPlay: { }, onPause: { }, onSeek: { _ in }, onScrubbing: { _ in })
+            .fixedSize(horizontal: false, vertical: true)
     }
 }
diff --git a/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessageRecordingButton.swift b/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessageRecordingButton.swift
index 950c1483b..1f59fdfd3 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessageRecordingButton.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessageRecordingButton.swift
@@ -69,7 +69,7 @@ private struct VoiceMessageRecordingButtonStyle: ButtonStyle {
 
 struct VoiceMessageRecordingButton_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
-        HStack {
+        HStack(spacing: 8) {
             VoiceMessageRecordingButton(mode: .idle)
             
             VoiceMessageRecordingButton(mode: .recording)
diff --git a/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessageRecordingComposer.swift b/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessageRecordingComposer.swift
index 6414b3bba..c1676d3d2 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessageRecordingComposer.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessageRecordingComposer.swift
@@ -45,9 +45,7 @@ struct VoiceMessageRecordingComposer_Previews: PreviewProvider, TestablePreview
     static let recorderState = AudioRecorderState()
     
     static var previews: some View {
-        VStack {
-            VoiceMessageRecordingComposer(recorderState: recorderState)
-                .fixedSize(horizontal: false, vertical: true)
-        }
+        VoiceMessageRecordingComposer(recorderState: recorderState)
+            .fixedSize(horizontal: false, vertical: true)
     }
 }
diff --git a/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessageRecordingView.swift b/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessageRecordingView.swift
index f2865fd43..57ca551ad 100644
--- a/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessageRecordingView.swift
+++ b/ElementX/Sources/Screens/ComposerToolbar/View/VoiceMessageRecordingView.swift
@@ -42,7 +42,7 @@ struct VoiceMessageRecordingView: View {
     }
     
     var body: some View {
-        HStack {
+        HStack(spacing: 8) {
             VoiceMessageRecordingBadge()
                 .frame(width: recordingIndicatorSize, height: recordingIndicatorSize)
 
diff --git a/ElementX/Sources/Screens/CreatePollScreen/View/CreatePollScreen.swift b/ElementX/Sources/Screens/CreatePollScreen/View/CreatePollScreen.swift
index 9e102ff8d..6f3ec56c9 100644
--- a/ElementX/Sources/Screens/CreatePollScreen/View/CreatePollScreen.swift
+++ b/ElementX/Sources/Screens/CreatePollScreen/View/CreatePollScreen.swift
@@ -137,7 +137,7 @@ private struct CreatePollOptionView: View {
     let deleteAction: () -> Void
 
     var body: some View {
-        HStack {
+        HStack(spacing: 8) {
             if editMode?.wrappedValue == .active {
                 Button(role: .destructive, action: deleteAction) {
                     CompoundIcon(\.delete)
diff --git a/ElementX/Sources/Screens/EmojiPickerScreen/View/EmojiPickerScreenHeaderView.swift b/ElementX/Sources/Screens/EmojiPickerScreen/View/EmojiPickerScreenHeaderView.swift
index 4e1bd239f..6225f42de 100644
--- a/ElementX/Sources/Screens/EmojiPickerScreen/View/EmojiPickerScreenHeaderView.swift
+++ b/ElementX/Sources/Screens/EmojiPickerScreen/View/EmojiPickerScreenHeaderView.swift
@@ -20,19 +20,15 @@ struct EmojiPickerScreenHeaderView: View {
     let title: String
     
     var body: some View {
-        HStack {
-            Text(title)
-                .font(.compound.bodyMD.bold())
-                .foregroundColor(.compound.textPrimary)
-                .frame(maxWidth: .infinity, alignment: .leading)
-        }
+        Text(title)
+            .font(.compound.bodyMD.bold())
+            .foregroundColor(.compound.textPrimary)
+            .frame(maxWidth: .infinity, alignment: .leading)
     }
 }
 
 struct EmojiPickerScreenHeaderView_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
-        Group {
-            EmojiPickerScreenHeaderView(title: "Title")
-        }
+        EmojiPickerScreenHeaderView(title: "Title")
     }
 }
diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift
index c401de68b..ff59381b9 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift
@@ -103,7 +103,7 @@ struct HomeScreenRoomCell: View {
     
     @ViewBuilder
     private var footer: some View {
-        HStack(alignment: .firstTextBaseline) {
+        HStack(alignment: .firstTextBaseline, spacing: 0) {
             ZStack(alignment: .topLeading) {
                 // Hidden text with 2 lines to maintain consistent height, scaling with dynamic text.
                 Text(" \n ")
diff --git a/ElementX/Sources/Screens/InvitesScreen/View/InvitesScreenCell.swift b/ElementX/Sources/Screens/InvitesScreen/View/InvitesScreenCell.swift
index e812ac48a..0f83e1c38 100644
--- a/ElementX/Sources/Screens/InvitesScreen/View/InvitesScreenCell.swift
+++ b/ElementX/Sources/Screens/InvitesScreen/View/InvitesScreenCell.swift
@@ -70,7 +70,7 @@ struct InvitesScreenCell: View {
     @ViewBuilder
     private var inviterView: some View {
         if let invitedText = attributedInviteText, let name = invite.roomDetails.inviter?.displayName {
-            HStack(alignment: .firstTextBaseline) {
+            HStack(alignment: .firstTextBaseline, spacing: 8) {
                 LoadableAvatarImage(url: invite.roomDetails.inviter?.avatarURL,
                                     name: name,
                                     contentID: name,
@@ -85,7 +85,7 @@ struct InvitesScreenCell: View {
     
     @ViewBuilder
     private var textualContent: some View {
-        VStack(alignment: .leading) {
+        VStack(alignment: .leading, spacing: 0) {
             Text(title)
                 .font(.compound.bodyLGSemibold)
                 .foregroundColor(.compound.textPrimary)
diff --git a/ElementX/Sources/Screens/OnboardingScreen/View/OnboardingScreen.swift b/ElementX/Sources/Screens/OnboardingScreen/View/OnboardingScreen.swift
index e0e8eba4f..712d4c9d3 100644
--- a/ElementX/Sources/Screens/OnboardingScreen/View/OnboardingScreen.swift
+++ b/ElementX/Sources/Screens/OnboardingScreen/View/OnboardingScreen.swift
@@ -24,7 +24,7 @@ struct OnboardingScreen: View {
     
     var body: some View {
         GeometryReader { geometry in
-            VStack(alignment: .leading) {
+            VStack(alignment: .leading, spacing: 0) {
                 Spacer()
                     .frame(height: UIConstants.spacerHeight(in: geometry))
                 
@@ -36,6 +36,7 @@ struct OnboardingScreen: View {
                     .frame(width: geometry.size.width)
                     .padding(.bottom, UIConstants.actionButtonBottomPadding)
                     .padding(.bottom, geometry.safeAreaInsets.bottom > 0 ? 0 : 16)
+                    .padding(.top, 8)
                 
                 Spacer()
                     .frame(height: UIConstants.spacerHeight(in: geometry))
@@ -49,7 +50,7 @@ struct OnboardingScreen: View {
     }
     
     var content: some View {
-        VStack {
+        VStack(spacing: 0) {
             Spacer()
             
             if verticalSizeClass == .regular {
diff --git a/ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreen.swift b/ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreen.swift
index 151dfce70..de48880e0 100644
--- a/ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreen.swift
+++ b/ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreen.swift
@@ -24,7 +24,7 @@ struct RoomMembersListScreen: View {
     
     var body: some View {
         ScrollView {
-            LazyVStack(alignment: .leading) {
+            LazyVStack(alignment: .leading, spacing: 12) {
                 membersSection(data: context.viewState.visibleInvitedMembers, sectionTitle: L10n.screenRoomMemberListPendingHeaderTitle)
                 membersSection(data: context.viewState.visibleJoinedMembers, sectionTitle: L10n.screenRoomMemberListHeaderTitle(Int(context.viewState.joinedMembersCount)))
             }
@@ -54,7 +54,7 @@ struct RoomMembersListScreen: View {
                 Text(sectionTitle)
                     .foregroundColor(.compound.textSecondary)
                     .font(.compound.bodyLG)
-                    .padding(.vertical, 12)
+                    .padding(.top, 12)
             }
         }
         .padding(.horizontal)
diff --git a/ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreenMemberCell.swift b/ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreenMemberCell.swift
index 952db8534..dfd0f61b3 100644
--- a/ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreenMemberCell.swift
+++ b/ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreenMemberCell.swift
@@ -24,7 +24,7 @@ struct RoomMembersListScreenMemberCell: View {
         Button {
             context.send(viewAction: .selectMember(id: member.id))
         } label: {
-            HStack {
+            HStack(spacing: 8) {
                 LoadableAvatarImage(url: member.avatarURL,
                                     name: member.name ?? "",
                                     contentID: member.id,
@@ -36,26 +36,24 @@ struct RoomMembersListScreenMemberCell: View {
                     .font(.compound.bodyMDSemibold)
                     .foregroundColor(.compound.textPrimary)
                     .lineLimit(1)
-
-                Spacer()
             }
+            .frame(maxWidth: .infinity, alignment: .leading)
             .accessibilityElement(children: .combine)
         }
     }
 }
 
 struct RoomMembersListMemberCell_Previews: PreviewProvider, TestablePreview {
+    static let members: [RoomMemberProxyMock] = [
+        .mockAlice,
+        .mockBob,
+        .mockCharlie
+    ]
+    static let viewModel = RoomMembersListScreenViewModel(roomProxy: RoomProxyMock(with: .init(displayName: "Some room", members: members)),
+                                                          mediaProvider: MockMediaProvider(),
+                                                          userIndicatorController: ServiceLocator.shared.userIndicatorController)
     static var previews: some View {
-        let members: [RoomMemberProxyMock] = [
-            .mockAlice,
-            .mockBob,
-            .mockCharlie
-        ]
-        let viewModel = RoomMembersListScreenViewModel(roomProxy: RoomProxyMock(with: .init(displayName: "Some room", members: members)),
-                                                       mediaProvider: MockMediaProvider(),
-                                                       userIndicatorController: ServiceLocator.shared.userIndicatorController)
-        
-        return VStack {
+        VStack(spacing: 12) {
             ForEach(members, id: \.userID) { member in
                 RoomMembersListScreenMemberCell(member: .init(withProxy: member), context: viewModel.context)
             }
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/LongPressWithFeedback.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/LongPressWithFeedback.swift
index 680b6ea51..7ba8bf1ab 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Style/LongPressWithFeedback.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Style/LongPressWithFeedback.swift
@@ -72,7 +72,7 @@ struct LongPressWithFeedback_Previews: PreviewProvider, TestablePreview {
         var body: some View {
             NavigationStack {
                 ScrollView {
-                    VStack(alignment: .leading) {
+                    VStack(alignment: .leading, spacing: 8) {
                         mockBubble("This is a message from somebody with a couple of lines of text.")
                             .longPressWithFeedback { isPresentingSheet = true }
                         
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemAccessibilityModifier.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemAccessibilityModifier.swift
index 16346568b..cb35adf49 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemAccessibilityModifier.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemAccessibilityModifier.swift
@@ -33,7 +33,7 @@ private struct TimelineItemAccessibilityModifier: ViewModifier {
         case let timelineItem as EventBasedTimelineItemProtocol:
             content
                 .accessibilityRepresentation {
-                    VStack {
+                    VStack(spacing: 8) {
                         Text(timelineItem.sender.displayName ?? timelineItem.sender.id)
                         content
                     }
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
index 7834a367c..4f32cd1ed 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
@@ -49,7 +49,7 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
                 }
 
                 VStack(alignment: alignment, spacing: 0) {
-                    HStack {
+                    HStack(spacing: 0) {
                         if timelineItem.isOutgoing {
                             Spacer()
                         }
@@ -520,7 +520,7 @@ struct TimelineItemBubbledStylerView_Previews: PreviewProvider, TestablePreview
     }
 
     static var replies: some View {
-        VStack {
+        VStack(spacing: 0) {
             RoomTimelineItemView(viewState: .init(item: TextRoomTimelineItem(id: .init(timelineID: ""),
                                                                              timestamp: "10:42",
                                                                              isOutgoing: true,
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift
index a0f387e32..b649bb671 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift
@@ -27,16 +27,12 @@ struct TimelineItemPlainStylerView<Content: View>: View {
     @State private var showItemActionMenu = false
 
     var body: some View {
-        VStack(alignment: .trailing) {
+        VStack(alignment: .trailing, spacing: 0) {
             VStack(alignment: .leading, spacing: 4) {
                 header
 
                 VStack(alignment: .leading, spacing: 4) {
-                    HStack(alignment: .firstTextBaseline) {
-                        contentWithReply
-
-                        Spacer()
-                    }
+                    contentWithReply
                     supplementaryViews
                 }
             }
@@ -47,7 +43,7 @@ struct TimelineItemPlainStylerView<Content: View>: View {
     
     @ViewBuilder
     var contentWithReply: some View {
-        VStack(alignment: .leading) {
+        VStack(alignment: .leading, spacing: 8) {
             if let messageTimelineItem = timelineItem as? EventBasedMessageTimelineItemProtocol {
                 if messageTimelineItem.isThreaded {
                     ThreadDecorator()
@@ -98,8 +94,8 @@ struct TimelineItemPlainStylerView<Content: View>: View {
     @ViewBuilder
     private var header: some View {
         if shouldShowSenderDetails {
-            HStack {
-                HStack {
+            HStack(spacing: 8) {
+                HStack(spacing: 8) {
                     TimelineSenderAvatarView(timelineItem: timelineItem)
                     Text(timelineItem.sender.displayName ?? timelineItem.sender.id)
                         .font(.subheadline)
@@ -123,7 +119,7 @@ struct TimelineItemPlainStylerView<Content: View>: View {
     
     @ViewBuilder
     private var supplementaryViews: some View {
-        VStack {
+        VStack(spacing: 4) {
             if timelineItem.properties.isEdited {
                 Text(L10n.commonEditedSuffix)
                     .font(.compound.bodySM)
@@ -251,8 +247,9 @@ struct TimelineItemPlainStylerView_Previews: PreviewProvider, TestablePreview {
             }
         }
         .environment(\.timelineStyle, .plain)
-        .previewLayout(.sizeThatFits)
         .environmentObject(viewModel.context)
+        .previewLayout(.sizeThatFits)
+        
         threads
             .padding()
             .environment(\.timelineStyle, .plain)
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyler.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyler.swift
index 7abb9eb28..f399c614f 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyler.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyler.swift
@@ -145,7 +145,7 @@ struct TimelineItemStyler_Previews: PreviewProvider, TestablePreview {
                                                                  content: .init(body: "באמת‏! -- house!"))
 
     static var testView: some View {
-        VStack {
+        VStack(spacing: 0) {
             TextRoomTimelineView(timelineItem: base)
             TextRoomTimelineView(timelineItem: sentNonLast)
             TextRoomTimelineView(timelineItem: sentLast)
@@ -156,7 +156,7 @@ struct TimelineItemStyler_Previews: PreviewProvider, TestablePreview {
     }
 
     static var languagesTestView: some View {
-        VStack {
+        VStack(spacing: 0) {
             TextRoomTimelineView(timelineItem: ltrString)
             TextRoomTimelineView(timelineItem: rtlString)
             TextRoomTimelineView(timelineItem: ltrStringThatContainsRtl)
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/ReactionsSummaryView.swift b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/ReactionsSummaryView.swift
index 5dd32586b..566b7dc22 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/ReactionsSummaryView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/ReactionsSummaryView.swift
@@ -67,7 +67,7 @@ struct ReactionsSummaryView: View {
         TabView(selection: $selectedReactionKey) {
             ForEach(reactions, id: \.self) { reaction in
                 ScrollView {
-                    VStack(alignment: .leading) {
+                    VStack(alignment: .leading, spacing: 8) {
                         ForEach(reaction.senders, id: \.self) { sender in
                             ReactionSummarySenderView(sender: sender, member: members[sender.senderID], imageProvider: imageProvider)
                                 .padding(.horizontal, 16)
@@ -122,15 +122,15 @@ private struct ReactionSummarySenderView: View {
     }
     
     var body: some View {
-        HStack {
+        HStack(spacing: 8) {
             LoadableAvatarImage(url: member?.avatarURL,
                                 name: displayName,
                                 contentID: sender.senderID,
                                 avatarSize: .user(on: .timeline),
                                 imageProvider: imageProvider)
             
-            VStack(alignment: .leading) {
-                HStack {
+            VStack(alignment: .leading, spacing: 0) {
+                HStack(spacing: 8) {
                     Text(displayName)
                         .font(.compound.bodyMDSemibold)
                         .frame(maxWidth: .infinity, alignment: .leading)
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineDeliveryStatusView.swift b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineDeliveryStatusView.swift
index 27dd82c57..b66f5b33b 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineDeliveryStatusView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineDeliveryStatusView.swift
@@ -42,7 +42,7 @@ struct TimelineDeliveryStatusView: View {
 
 struct TimelineDeliveryStatusView_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
-        VStack {
+        VStack(spacing: 8) {
             TimelineDeliveryStatusView(deliveryStatus: .sending)
             TimelineDeliveryStatusView(deliveryStatus: .sent)
         }
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift
index 0f565991a..ad719d10c 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReactionsView.swift
@@ -205,7 +205,7 @@ struct TimelineReactionAddMoreButtonLabel: View {
 
 struct TimelineReactionViewPreviewsContainer: View {
     var body: some View {
-        VStack {
+        VStack(spacing: 8) {
             TimelineReactionsView(context: RoomScreenViewModel.mock.context,
                                   itemID: .init(timelineID: "1"),
                                   reactions: [AggregatedReaction.mockReactionWithLongText,
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReadReceiptsView.swift b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReadReceiptsView.swift
index 009afeeff..1932fa9be 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReadReceiptsView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Supplementary/TimelineReadReceiptsView.swift
@@ -92,7 +92,7 @@ struct TimelineReadReceiptsView_Previews: PreviewProvider, TestablePreview {
     }
 
     static var previews: some View {
-        VStack {
+        VStack(spacing: 8) {
             TimelineReadReceiptsView(timelineItem: mockTimelineItem(with: singleReceipt))
                 .environmentObject(viewModel.context)
             TimelineReadReceiptsView(timelineItem: mockTimelineItem(with: doubleReceipt))
diff --git a/ElementX/Sources/Screens/RoomScreen/View/SwipeRightAction.swift b/ElementX/Sources/Screens/RoomScreen/View/SwipeRightAction.swift
index f9390d2e4..70dd0d75d 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/SwipeRightAction.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/SwipeRightAction.swift
@@ -119,7 +119,7 @@ struct SwipeRightAction_Previews: PreviewProvider, TestablePreview {
         var body: some View {
             NavigationStack {
                 ScrollView {
-                    VStack(alignment: .leading) {
+                    VStack(alignment: .leading, spacing: 2) {
                         mockBubble("This is a message from somebody with a couple of lines of text.")
                             .swipeRightAction {
                                 Image(systemName: "flame")
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/AudioRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/AudioRoomTimelineView.swift
index 18494038d..7a77511a1 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/AudioRoomTimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/AudioRoomTimelineView.swift
@@ -22,7 +22,7 @@ struct AudioRoomTimelineView: View {
 
     var body: some View {
         TimelineStyler(timelineItem: timelineItem) {
-            HStack {
+            HStack(spacing: 8) {
                 Image(systemName: "waveform")
                     .foregroundColor(.compound.iconPrimary)
                 FormattedBodyText(text: timelineItem.content.body)
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/CollapsibleRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/CollapsibleRoomTimelineView.swift
index 9dc48e939..7ef370e54 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/CollapsibleRoomTimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/CollapsibleRoomTimelineView.swift
@@ -34,7 +34,7 @@ struct CollapsibleRoomTimelineView: View {
                     isExpanded.toggle()
                 }
             } label: {
-                HStack(alignment: .center) {
+                HStack(alignment: .center, spacing: 8) {
                     Text(L10n.roomTimelineStateChanges(timelineItem.items.count))
                     Text(Image(systemName: "chevron.forward"))
                         .rotationEffect(.degrees(isExpanded ? 90 : 0))
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedHistoryRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedHistoryRoomTimelineView.swift
index f376401f8..85633e5e1 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedHistoryRoomTimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedHistoryRoomTimelineView.swift
@@ -60,7 +60,7 @@ private struct EncryptedHistoryLabelStyle: LabelStyle {
 
 struct EncryptedHistoryRoomTimelineView_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
-        VStack {
+        VStack(spacing: 8) {
             EncryptedHistoryRoomTimelineView(timelineItem: .init(id: .random, isSessionVerified: true))
             EncryptedHistoryRoomTimelineView(timelineItem: .init(id: .random, isSessionVerified: false))
         }
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/FileRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/FileRoomTimelineView.swift
index f0ad65268..878ececdf 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/FileRoomTimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/FileRoomTimelineView.swift
@@ -22,7 +22,7 @@ struct FileRoomTimelineView: View {
     
     var body: some View {
         TimelineStyler(timelineItem: timelineItem) {
-            HStack {
+            HStack(spacing: 8) {
                 Image(systemName: "doc.text.fill")
                     .foregroundColor(.compound.iconPrimary)
                 FormattedBodyText(text: timelineItem.content.body)
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/LocationRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/LocationRoomTimelineView.swift
index 7191596ec..d80812029 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/LocationRoomTimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/LocationRoomTimelineView.swift
@@ -87,7 +87,7 @@ struct LocationRoomTimelineView_Previews: PreviewProvider, TestablePreview {
 
     static var previews: some View {
         ScrollView {
-            VStack {
+            VStack(spacing: 8) {
                 states
                     .padding(.horizontal)
             }
@@ -96,7 +96,7 @@ struct LocationRoomTimelineView_Previews: PreviewProvider, TestablePreview {
         .previewDisplayName("Bubbles")
         
         ScrollView {
-            VStack {
+            VStack(spacing: 0) {
                 states
                     .padding(.horizontal)
             }
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/PollOptionView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/PollOptionView.swift
index 4dbd0637b..74c734074 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/PollOptionView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/PollOptionView.swift
@@ -26,7 +26,7 @@ struct PollOptionView: View {
             FormRowAccessory(kind: .multipleSelection(isSelected: pollOption.isSelected))
 
             VStack(spacing: 10) {
-                HStack(alignment: .lastTextBaseline) {
+                HStack(alignment: .lastTextBaseline, spacing: 8) {
                     Text(pollOption.text)
                         .font(isFinalWinningOption ? .compound.bodyLGSemibold : .compound.bodyLG)
                         .multilineTextAlignment(.leading)
@@ -82,7 +82,7 @@ private struct PollProgressView: View {
 
 struct PollOptionView_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
-        VStack {
+        VStack(spacing: 8) {
             Group {
                 PollOptionView(pollOption: .init(id: "1",
                                                  text: "Italian 🇮🇹",
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/UnsupportedRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/UnsupportedRoomTimelineView.swift
index ea90d53ba..a3d3e08fc 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/UnsupportedRoomTimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/UnsupportedRoomTimelineView.swift
@@ -22,7 +22,7 @@ struct UnsupportedRoomTimelineView: View {
     var body: some View {
         TimelineStyler(timelineItem: timelineItem) {
             Label {
-                VStack(alignment: .leading) {
+                VStack(alignment: .leading, spacing: 0) {
                     Text("\(timelineItem.body): \(timelineItem.eventType)")
                         .fixedSize(horizontal: false, vertical: true)
                     
diff --git a/ElementX/Sources/Screens/RoomScreen/View/TimelineItemDebugView.swift b/ElementX/Sources/Screens/RoomScreen/View/TimelineItemDebugView.swift
index bc2ccd889..444dd619b 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/TimelineItemDebugView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/TimelineItemDebugView.swift
@@ -24,7 +24,7 @@ struct TimelineItemDebugView: View {
     var body: some View {
         NavigationStack {
             ScrollView {
-                VStack {
+                VStack(spacing: 8) {
                     TimelineItemInfoDisclosureGroup(title: "Model", text: info.model, isInitiallyExpanded: true)
                     
                     if let originalJSONInfo = info.originalJSON {
@@ -83,10 +83,9 @@ struct TimelineItemDebugView: View {
         
         @ViewBuilder
         var disclosureGroupContent: some View {
-            VStack(alignment: .leading) {
-                Spacer()
-                
+            VStack(alignment: .leading, spacing: 0) {
                 Divider()
+                    .padding(.vertical, 8)
                 
                 Text(text)
                     .font(.compound.bodyXS.monospaced())
diff --git a/ElementX/Sources/Screens/RoomScreen/View/TimelineItemMenu.swift b/ElementX/Sources/Screens/RoomScreen/View/TimelineItemMenu.swift
index f12e1b707..3101b342f 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/TimelineItemMenu.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/TimelineItemMenu.swift
@@ -142,7 +142,7 @@ public struct TimelineItemMenu: View {
     private let feedbackGenerator = UIImpactFeedbackGenerator(style: .heavy)
     
     public var body: some View {
-        VStack {
+        VStack(spacing: 8) {
             header
                 .frame(idealWidth: 300.0)
             
@@ -187,7 +187,7 @@ public struct TimelineItemMenu: View {
             
             Spacer(minLength: 8.0)
             
-            VStack(alignment: .leading) {
+            VStack(alignment: .leading, spacing: 0) {
                 Text(item.sender.displayName ?? item.sender.id)
                     .font(.compound.bodySMSemibold)
                     .foregroundColor(.compound.textPrimary)
@@ -211,7 +211,7 @@ public struct TimelineItemMenu: View {
     }
     
     private var reactionsSection: some View {
-        HStack(alignment: .center) {
+        HStack(alignment: .center, spacing: 8) {
             reactionButton(for: "👍️")
             reactionButton(for: "👎️")
             reactionButton(for: "🔥")
@@ -286,12 +286,10 @@ struct TimelineItemMenu_Previews: PreviewProvider, TestablePreview {
     static let viewModel = RoomScreenViewModel.mock
 
     static var previews: some View {
-        VStack {
-            if let item = RoomTimelineItemFixtures.singleMessageChunk.first as? EventBasedTimelineItemProtocol,
-               let actions = TimelineItemMenuActions(actions: [.copy, .edit, .reply(isThread: false), .redact], debugActions: [.viewSource]) {
-                TimelineItemMenu(item: item, actions: actions)
-            }
+        if let item = RoomTimelineItemFixtures.singleMessageChunk.first as? EventBasedTimelineItemProtocol,
+           let actions = TimelineItemMenuActions(actions: [.copy, .edit, .reply(isThread: false), .redact], debugActions: [.viewSource]) {
+            TimelineItemMenu(item: item, actions: actions)
+                .environmentObject(viewModel.context)
         }
-        .environmentObject(viewModel.context)
     }
 }
diff --git a/ElementX/Sources/Screens/SecureBackup/SecureBackupKeyBackupScreen/View/SecureBackupKeyBackupScreen.swift b/ElementX/Sources/Screens/SecureBackup/SecureBackupKeyBackupScreen/View/SecureBackupKeyBackupScreen.swift
index 2b797924a..4675e0101 100644
--- a/ElementX/Sources/Screens/SecureBackup/SecureBackupKeyBackupScreen/View/SecureBackupKeyBackupScreen.swift
+++ b/ElementX/Sources/Screens/SecureBackup/SecureBackupKeyBackupScreen/View/SecureBackupKeyBackupScreen.swift
@@ -52,7 +52,7 @@ struct SecureBackupKeyBackupScreen: View {
                 .font(.compound.bodyMD)
                 .multilineTextAlignment(.center)
             
-            VStack(alignment: .leading) {
+            VStack(alignment: .leading, spacing: 10) {
                 Label {
                     Text(L10n.screenKeyBackupDisableDescriptionPoint1)
                         .foregroundColor(.compound.textSecondary)
diff --git a/ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift b/ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift
index ed933a02a..d6fd6321a 100644
--- a/ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift
+++ b/ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift
@@ -121,19 +121,19 @@ struct SecureBackupRecoveryKeyScreen: View {
     }
     
     private var generateRecoveryKeySection: some View {
-        VStack(alignment: .leading) {
+        VStack(alignment: .leading, spacing: 8) {
             Text(L10n.commonRecoveryKey)
                 .foregroundColor(.compound.textPrimary)
                 .font(.compound.bodySM)
-         
-            HStack {
+            
+            Group {
                 if context.viewState.recoveryKey == nil {
                     Button(generateButtonTitle) {
                         context.send(viewAction: .generateKey)
                     }
                     .font(.compound.bodyLGSemibold)
                 } else {
-                    HStack(alignment: .top) {
+                    HStack(alignment: .top, spacing: 8) {
                         Text(context.viewState.recoveryKey ?? "")
                             .foregroundColor(.compound.textPrimary)
                             .font(.compound.bodyLG)
@@ -155,15 +155,16 @@ struct SecureBackupRecoveryKeyScreen: View {
             .background(Color.compound.bgSubtleSecondaryLevel0)
             .clipShape(RoundedRectangle(cornerRadius: 8))
             
-            HStack(alignment: .top) {
-                if context.viewState.recoveryKey == nil {
-                    CompoundIcon(\.infoSolid, size: .small, relativeTo: .compound.bodySM)
-                }
-                
+            Label {
                 Text(context.viewState.recoveryKeySubtitle)
                     .foregroundColor(.compound.textSecondary)
                     .font(.compound.bodySM)
+            } icon: {
+                if context.viewState.recoveryKey == nil {
+                    CompoundIcon(\.infoSolid, size: .small, relativeTo: .compound.bodySM)
+                }
             }
+            .labelStyle(.custom(spacing: 8, alignment: .top))
         }
     }
     
@@ -173,7 +174,7 @@ struct SecureBackupRecoveryKeyScreen: View {
     
     @ViewBuilder
     private var confirmRecoveryKeySection: some View {
-        VStack(alignment: .leading) {
+        VStack(alignment: .leading, spacing: 8) {
             Text(L10n.commonRecoveryKey)
                 .foregroundColor(.compound.textPrimary)
                 .font(.compound.bodySM)
diff --git a/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift b/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
index 315bfceff..b28074125 100644
--- a/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
+++ b/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
@@ -196,7 +196,7 @@ struct SettingsScreen: View {
                     })
                     .accessibilityIdentifier(A11yIdentifiers.settingsScreen.logout)
         } footer: {
-            VStack {
+            VStack(spacing: 0) {
                 versionText
                     .frame(maxWidth: .infinity)
                 
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/VoiceMessages/VoiceMessageRoomPlaybackView.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/VoiceMessages/VoiceMessageRoomPlaybackView.swift
index d97f6094b..c806ea5ef 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/VoiceMessages/VoiceMessageRoomPlaybackView.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/VoiceMessages/VoiceMessageRoomPlaybackView.swift
@@ -41,18 +41,16 @@ struct VoiceMessageRoomPlaybackView: View {
     }
     
     var body: some View {
-        HStack {
-            HStack {
-                VoiceMessageButton(state: .init(playerState.playerButtonPlaybackState),
-                                   size: .medium,
-                                   action: onPlayPause)
-                Text(timeLabelContent)
-                    .lineLimit(1)
-                    .font(.compound.bodySMSemibold)
-                    .foregroundColor(.compound.textSecondary)
-                    .monospacedDigit()
-                    .fixedSize(horizontal: true, vertical: true)
-            }
+        HStack(spacing: 8) {
+            VoiceMessageButton(state: .init(playerState.playerButtonPlaybackState),
+                               size: .medium,
+                               action: onPlayPause)
+            Text(timeLabelContent)
+                .lineLimit(1)
+                .font(.compound.bodySMSemibold)
+                .foregroundColor(.compound.textSecondary)
+                .monospacedDigit()
+                .fixedSize(horizontal: true, vertical: true)
 
             waveformView
                 .waveformInteraction(isDragging: $isDragging,
diff --git a/UITests/Sources/CreatePollScreenUITests.swift b/UITests/Sources/CreatePollScreenUITests.swift
index 807e85a5d..4367c3f6e 100644
--- a/UITests/Sources/CreatePollScreenUITests.swift
+++ b/UITests/Sources/CreatePollScreenUITests.swift
@@ -58,7 +58,8 @@ class CreatePollScreenUITests: XCTestCase {
         if app.keyboards.count > 0 {
             app.typeText("\n")
         }
-        app.swipeUp()
+        app.swipeUp() // Dismisses the keyboard.
+        app.swipeUp() // Ensures that the bottom is shown.
         
         XCTAssertFalse(addOption.exists)
         XCTAssertFalse(createButton.isEnabled)
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreen.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreen.png
index ca45ea754..1e2eeb2c6 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreen.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ad49c2d88bc1984b710b321481828dda71a962dfcf11b90b2da4d7870e9a6b2
-size 106363
+oid sha256:f9a2f4e712c9119228a204ef66394549921ca96a0ebbfc7a97c66bb9f1e0e1eb
+size 106368
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreenDmDetails.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreenDmDetails.png
index a59300e54..4570e7b09 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreenDmDetails.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreenDmDetails.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df3999aa71fe868d7cc18ef3c4ff2818d0b8caf06ccfc3a42a097aeca6e9bba4
-size 135985
+oid sha256:e6f518adb288d2a3647b0bfd198a13c0b52007328e0c46a085a07b03dd3e0600
+size 135987
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreenWithEmptyTopic.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreenWithEmptyTopic.png
index f9782b3ab..9b03d26ee 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreenWithEmptyTopic.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreenWithEmptyTopic.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c68034656284d48359ae1fbf764dbfe910594ecf60b34c42d4d54b47eccf5214
-size 139355
+oid sha256:04951f0bb428d9c78bef7542f12e3085e2bf00df118d6b5b387f268f9924d501
+size 139353
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreenWithInvite.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreenWithInvite.png
index ff94f0f13..dd1740174 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreenWithInvite.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreenWithInvite.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c7f944dd4213ea07885e3bf37a055c95151676933a435720fd0dbd1a75158b7
-size 111882
+oid sha256:317c07478022e58e8268fd80e4e2c95ce12febf63051e2b775868c0ae2e66385
+size 111893
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreenWithRoomAvatar.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreenWithRoomAvatar.png
index e50820053..4af50f78d 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreenWithRoomAvatar.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomDetailsScreenWithRoomAvatar.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b11231430ff3871f6793dd3bdd1e3a798da92638827d7820a2708bca4af12bb6
-size 143527
+oid sha256:2ba2969e48e045f7ab7d92201cc4eaf5b40f3773c60a6ffeb1f44d51f6a0c88f
+size 143534
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreen.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreen.png
index 4221ef172..49cedf0ff 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreen.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2468008fdb0e9683ca484ad955db1aa40c68aa4662b900cf0a335fd6a4c8195c
-size 75088
+oid sha256:693324fba55abd71cecbc4719ecb6273a983147754970e9116660fd7a4e8d04f
+size 75112
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreenPendingInvites-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreenPendingInvites-1.png
index 9173ed5c1..d97f5cd4e 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreenPendingInvites-1.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreenPendingInvites-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a91052dfd8468914be68593b347f27394a669fd1d5ff3b0ae2680d2684322a0
-size 65669
+oid sha256:80dff2a5ae296b82c40df940962f1781e5057424abcd159efbbfc3219321cc2d
+size 65610
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreenPendingInvites-2.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreenPendingInvites-2.png
index 53d1e3fd9..a13e3e80a 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreenPendingInvites-2.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreenPendingInvites-2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c9251a4c74b48fcc297552ce9a81813c5c07804a03bc37ae6bb358dd7fe3605
-size 84654
+oid sha256:e2c94ea984affe3c9889862b8e96a5b4216dcc58acd681236934f5fc93eb455c
+size 85533
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreenPendingInvites.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreenPendingInvites.png
index 7f37819b9..b7e0225fd 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreenPendingInvites.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomMembersListScreenPendingInvites.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96f0498150e63dd13409971f0917952eb2264ea6ee6f83a16e69f9c54ad67f92
-size 77336
+oid sha256:3973cdec920a7fc208b779c00599828885ea673e1df20ec8076b3ff1df9b2089
+size 77345
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.settings.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.settings.png
index b014d81aa..d03c48f21 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.settings.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.settings.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e6f92b34f1fc44ab715f811927c5540411e57e146fec22ef8289401bfddb088
-size 142521
+oid sha256:1b9249478e9774a710f5f9d24fc60e5a3b587971e1cd580610ccecce79b96f62
+size 142526
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.onboarding.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.onboarding.png
index 900252837..921696197 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.onboarding.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.onboarding.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f29216a451b9671dc52be888ff8000684ec30878170e5fb590875e6ca29b5739
-size 990805
+oid sha256:392d7264ceb22146a4a066ccd46a75a37c06789966bc49f23fb2fe0c23358a2b
+size 990811
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreen.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreen.png
index c90917396..7431ba4e3 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreen.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ffde28c0f042f7cfc608666845fb3fe1cf7c5240597a06a7465279b023034991
-size 130532
+oid sha256:e5d3eb7e725323854f9b2b6dc6136fd892b72b7a69971f7649972521a8ceea4b
+size 130502
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenDmDetails.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenDmDetails.png
index a146ec507..1af398de8 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenDmDetails.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenDmDetails.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad2f44e3279c30db46a95cd8b9cd17dfcd65536fd58fd46e0498a374c4a6c457
-size 180641
+oid sha256:38136f84c412cf930cf0dff2eb04761e7d26966ce551caf3d8c7132f5c253a4d
+size 180587
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenWithEmptyTopic.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenWithEmptyTopic.png
index 2b8815fea..28d5c4dd1 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenWithEmptyTopic.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenWithEmptyTopic.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba5971570d55aa29cbe25686a29f5442d4e3d3835e8e9be1afec5738426d09ee
-size 180880
+oid sha256:7d7860efaea8775f9ad533b811a3a106d7cb2269da171da4d7ecd02b21ea2ef6
+size 182360
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenWithInvite.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenWithInvite.png
index 58706d0b3..36559df25 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenWithInvite.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenWithInvite.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e947a5a3b6fadba3465f5eaa739da96375545872b0dd363c690ef6f9834ba8e4
-size 140774
+oid sha256:d2c84fbba28f0df960ec488becfdefdaca862efe9dabcb34b3128f9444ad2f0d
+size 140714
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenWithRoomAvatar.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenWithRoomAvatar.png
index 94ba84c14..90637658c 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenWithRoomAvatar.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomDetailsScreenWithRoomAvatar.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e0c1164e91b1291249187a4c1c8d5037ca7c57335f63e02ec747da89a49310a
-size 191808
+oid sha256:4e1303ac678a6ff68a55fd48fe2d16b72cfdcd073bc1dd950cd7a950f9c7acc6
+size 191705
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreen.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreen.png
index 3051e013c..5e86e57d7 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreen.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e8cfdcd28ab441b98be4170dadc88d8d266b946f950969f9abf1a1451059347
-size 81010
+oid sha256:430d5c21d57cd98206a64997f36f3921d80d164677ba956323ad8b3398c2db69
+size 79543
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreenPendingInvites-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreenPendingInvites-1.png
index 62f82a824..475e16a30 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreenPendingInvites-1.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreenPendingInvites-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7ea0b877736281d7fc9cd1070cc1b579419c0a0b83447c1169e34300d922e80
-size 109987
+oid sha256:f7f7d618b7bfd6eedf74cadef57dc2b42226b6b6bd72aacc50c973422f8a5eef
+size 66084
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreenPendingInvites-2.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreenPendingInvites-2.png
index abbbcf2b4..d846c32a3 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreenPendingInvites-2.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreenPendingInvites-2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3665a5674f0fccfd75002ab9917448b8928a8643af1e5bf33b8dee75d1868b46
-size 117023
+oid sha256:473c6a4cfdbb4ed0d79f79834adb19504e730732e6f76f69e4709f166fdfdbbc
+size 65840
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreenPendingInvites.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreenPendingInvites.png
index 639be0c79..8a3cd4395 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreenPendingInvites.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomMembersListScreenPendingInvites.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81f3da0d16d68db3689ac1b60fcf8e7671ad842a01e38fbf4ba5b98c40235419
-size 86455
+oid sha256:2607c3dd53dd89261459062996c46b6263b1007061c297bf7d3989bf3af72421
+size 86253
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.settings.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.settings.png
index 03506d0ba..37c1abe1f 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.settings.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.settings.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c69370f221a490d0e8303b8f1849c30218cec9ced7f41c4e511da3a1e04fb71f
-size 170945
+oid sha256:bb1969e353f2416eee4f53e0fa324836e057df654f607900356d53f784019dad
+size 170830
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.onboarding.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.onboarding.png
index dc325e673..ef2a3b950 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.onboarding.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.onboarding.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50aaed599643e5321ae6c07a91978db06da35a260a983ec138633747b32b14a3
-size 1296649
+oid sha256:3480e47e56d9487354e552fd2dc8236d48781d6f9f8dfed2b7b63c5cbe2a9448
+size 1296599
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreen.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreen.png
index e4cb4d431..238c9df0f 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreen.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ee0263916f4d46830d5baa235aa60b1e44609a6d453f4f0afbce2c54da75530
-size 120976
+oid sha256:fffe679e0097334491a297d6c7ca9703a1b499aa1508c3fd22f352079b7174d8
+size 120985
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreenDmDetails.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreenDmDetails.png
index 60265cc25..0ce7e2843 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreenDmDetails.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreenDmDetails.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12247e419943cd05d5eeb41049b1b46636074bd12fd50a2bf12c70423cb8f003
-size 150670
+oid sha256:bad10df588a7066d5dbccf481a975ae95b7bf630a0f4e0820ec1733833b69896
+size 150673
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreenWithEmptyTopic.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreenWithEmptyTopic.png
index fff795d5f..081e7e279 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreenWithEmptyTopic.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreenWithEmptyTopic.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8ef3cede0644e696dfd11e9f04b46da218798a05c83b575176e00c41e69dd41
-size 155000
+oid sha256:0896353f486905039ce020e868fc4babaf1dc53dbd165f32659a9a7ce7714238
+size 155008
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreenWithInvite.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreenWithInvite.png
index 0378c50c9..535428c3c 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreenWithInvite.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreenWithInvite.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10638b4d909b868d9184537718542b542474ba0b216463248d03592b66774d0b
-size 126956
+oid sha256:89617f27dfaf1d42d236471f12ad724752f59efd6cfbf60d201902260aa23b5d
+size 126973
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreenWithRoomAvatar.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreenWithRoomAvatar.png
index 4d7a6c237..a2d12518f 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreenWithRoomAvatar.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomDetailsScreenWithRoomAvatar.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4907c3dab42439a4594ce300d786a64fb7b3941d91358bb57c7bf3dda5211a28
-size 158413
+oid sha256:af3f69d7d51da95a7ff58903b62dbf2e6683c965713974fe68096f05f0804865
+size 158422
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreen.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreen.png
index 4022ac124..13048f2bd 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreen.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5819befd00b73dd9a6a68617c55cd8b9870c35a3251be2aa344301a89ef82dba
-size 78706
+oid sha256:19aa6ee4699cf81e7684c871a4178eae3eac2ebc4702c0f1578b913fe06050eb
+size 78734
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreenPendingInvites-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreenPendingInvites-1.png
index 8d91aad9d..d882d3644 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreenPendingInvites-1.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreenPendingInvites-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0812122c3588a8fdb8a059a06bb49216f56e51d2b4e3f506af34c355faeec42
-size 66355
+oid sha256:da01891312f103ddc19155239266a453e813f15fedb94e6e592c362281aea340
+size 66297
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreenPendingInvites-2.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreenPendingInvites-2.png
index 407d5573b..529846f82 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreenPendingInvites-2.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreenPendingInvites-2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef7f543d2adcea2313d123ce142009505ff69a7ed7a01ad4535f49a39f1040fe
-size 67860
+oid sha256:7908bcf5b4be638ef318f227d9aca6d9abb3386f260bc5653127aa033656da23
+size 67874
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreenPendingInvites.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreenPendingInvites.png
index ae57d1fea..098dff6ad 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreenPendingInvites.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomMembersListScreenPendingInvites.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7177b048ae02abd281c59023196b1b92b9a117c9331a410271ab6b09b98afbb4
-size 81332
+oid sha256:d5149a2c62ea4ebdc114eb09dc744e723adfd5c20a7360632448e0703b864f5c
+size 81344
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.settings.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.settings.png
index e308928e4..f2c07d7f0 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.settings.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.settings.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80774cf7193943271488b87e8e4eabc92553b73f2947f59f8de7aaefdacdbec0
-size 152559
+oid sha256:ea384d546786b66a4eb5dabc696fcc604462b44bfb8e36cb8ead96241178df4b
+size 152061
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.onboarding.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.onboarding.png
index 5791ebb03..17f27d99f 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.onboarding.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.onboarding.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56b7492971c77758f1fd7fb34a243803c28b02c49d1d5ab05b9410d89e37c33f
-size 1013504
+oid sha256:1e8c2594242d3ea72a46202703f84c0920d41491c36f12c85aeb9d54fd3f9625
+size 1013586
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreen.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreen.png
index a594ed6c3..5fff4147c 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreen.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ca45d62287196bf84f4c1b2bda5db76f5adb91d6ed38759fbe32ff4e323e14d
-size 167170
+oid sha256:cd936b28332e1c7e919b5f7d0af0db3dddf39316a6e8f8bbc6d8ccbef41c5f45
+size 167181
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenDmDetails.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenDmDetails.png
index 679649c15..b1b78ddfb 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenDmDetails.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenDmDetails.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:51f03a61979619c8900ce0ab03b5921d28a41fceb366472bee74ce1d47aa734d
-size 208309
+oid sha256:1855fd88b897e115dea4e256efcbe84f6694b1aa87697c77b1a3a531346cf9a2
+size 208043
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenWithEmptyTopic.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenWithEmptyTopic.png
index ccdc755df..b469279b9 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenWithEmptyTopic.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenWithEmptyTopic.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dc942209d8b4da1463b0bae9d2eb0acff8b921802268f879eb116e37dd65bc34
-size 196280
+oid sha256:66a0ced41b7608a062d4856336d799f3a72e125abe441510a18a5cd1ac084062
+size 196212
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenWithInvite.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenWithInvite.png
index 48ccf191d..69dae052a 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenWithInvite.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenWithInvite.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:862c6810149dac38a50831e4043cc44222c206c5a455462e96fe6aecb70269ec
-size 171409
+oid sha256:f3f3e5bbbe39617d7f43095cacd37a496efa37d5098b9c9250c06b0278d36b89
+size 171338
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenWithRoomAvatar.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenWithRoomAvatar.png
index 2711a0d4b..4f67ad397 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenWithRoomAvatar.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomDetailsScreenWithRoomAvatar.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1128ae7b0fa1ac47467ba4660e2a5be4309b8acfe58ce7ed5a0f94131b858f7
-size 216180
+oid sha256:2efee82a06efc18f7bf12ccd7e207c87eacb5fee90b328c4896f772e647ebcc4
+size 216354
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreen.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreen.png
index 0775ba2e3..bb78e2dbc 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreen.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreen.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26f46b89d4d0cb6029fc03eb946002b994278de7383b61f3c0a727297bdc9c76
-size 86657
+oid sha256:312a05c6dab40d5968b3564321a6b642beed544918714167d7b75ae5e3cf8deb
+size 86572
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreenPendingInvites-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreenPendingInvites-1.png
index 1d78e2ebc..da708918d 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreenPendingInvites-1.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreenPendingInvites-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:67ee54da5e3aa5e374736f6ba5a093b6101fa74e29ef2e4e9a3538d2237c650b
-size 67503
+oid sha256:38702d490aa1e60d487a334c7cea297a92f6d30beb84913ba32bd4eb5e86368c
+size 67409
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreenPendingInvites-2.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreenPendingInvites-2.png
index 46020eada..ad8f00841 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreenPendingInvites-2.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreenPendingInvites-2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dfebb031795432613cad7cc935a81f1fa2b1dc28d05e44e22f573e38215b4400
-size 113790
+oid sha256:d9be0e32a7a2d78d0939ec31c952424ffd9848ec38db66351c46f4c11529aa35
+size 70097
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreenPendingInvites.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreenPendingInvites.png
index 29a01afe5..22ee9b266 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreenPendingInvites.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomMembersListScreenPendingInvites.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89a6f419c91ef949f9eee7f8a0e1f757b022057379799b4453c0b4f044fa7c72
-size 92751
+oid sha256:eecd0af14ad40eb14da5ee3dc070bfd4e95dab343fe3e46ac28104612f5e8c2b
+size 92488
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.settings.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.settings.png
index f5c492d89..43ef82dba 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.settings.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.settings.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70a375a63ca02a6bfbdf45cf5d15224fce9d2432eb5b70942f43a5284329e6d0
-size 191661
+oid sha256:cae392557a63d6146d08592718d4c88e781b643c25a25014231585a2db6e1c56
+size 183124
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_formRowLabelStyle.1.png b/UnitTests/__Snapshots__/PreviewTests/test_formRowLabelStyle.1.png
index 73fe8f1d9..9aa1c8bda 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_formRowLabelStyle.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_formRowLabelStyle.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c5aec76f55285117147d626dcb2c0ed7ab25b93af7429d836b9d8f29374761c
-size 83856
+oid sha256:91b35d6272d23ab9eeeae63aa99fddb5372405290242c20f64058082cb6b244a
+size 83860
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_headerView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_headerView.1.png
index 89cb8a50e..bdb515427 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_headerView.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_headerView.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6076a608bc77dcd2cdba417db29fecca1529ea06364dcb6c6cd2020dd9b4347e
-size 130039
+oid sha256:2e396f25c3a5f10594b9cd47fc3f20b00aa2719db55478a026afd3ee842b34ab
+size 130060
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Plain.png
index 592f654db..b19903484 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Plain.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Plain.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a10530690e2b2b934bc6bcf430b928bf25233f0dbd5d8799a4a726ba2c1b65b1
-size 1291612
+oid sha256:638abf8df2c53a5927ffd5eca268edfb70708056dad193021f6443bfbe7d9fe3
+size 1309326
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.1.png b/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.1.png
index 9a78a3b93..783879580 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df418cf07d69d2701642be411b4d097460345a7031b64377e5ac2184258b7239
-size 90689
+oid sha256:7077f69587c6b118fdec1bdb92f41f1966b521d6e9e953d52d28d62d6e50fc24
+size 90696
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_noticeRoomTimelineView.2.png b/UnitTests/__Snapshots__/PreviewTests/test_noticeRoomTimelineView.2.png
index 78e706688..d3259e309 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_noticeRoomTimelineView.2.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_noticeRoomTimelineView.2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36f9b0c00c7d3d0355bffc18b185e9b8711bdf92f5e63aee05157a5152a37339
-size 114753
+oid sha256:4d2f7d8badf0946cce15be49e3e1b117b10fd0c0ac138f98aaf3028dcd9e0680
+size 113232
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Plain.png
index a9624b443..8575ca7d6 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Plain.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Plain.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd6de2482b58c350ecf79d63e6a69f166f27d6030aa2a9a90b7dfe05bddc8f05
-size 120807
+oid sha256:4eb44e0a4d8d893d6d5aeeb5b06cba7f009a124129eef693fbcb0a25f2f888e8
+size 120474
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Plain.png
index c84b64fc6..a438a31aa 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Plain.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Plain.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f6477f640734df32a038ea4f7f42bef16628e8cd5955eeaf0166d6d579e7a03
-size 114223
+oid sha256:5489e7a1df166e7164a095d8e991ee73c7a8c38210391938f40310b8c7fceb5b
+size 114270
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Plain.png
index df2519aa4..51abf9635 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Plain.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Plain.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7fadd640c74b723a16b98696e99a167af973b24d8346454361689edc3aeaa9a
-size 114310
+oid sha256:6c1a66188d85232900d71246a997fa5ee30565deafaefcc1e814ca728cfb4148
+size 114354
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Plain.png
index df2519aa4..51abf9635 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Plain.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Plain.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7fadd640c74b723a16b98696e99a167af973b24d8346454361689edc3aeaa9a
-size 114310
+oid sha256:6c1a66188d85232900d71246a997fa5ee30565deafaefcc1e814ca728cfb4148
+size 114354
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Plain.png
index 108d4048f..564b8f143 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Plain.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Plain.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f547fd2260b8a3a1c48d0e4c31d76f6e808a291d5e7db65818e2eb84434b17c
-size 109470
+oid sha256:f8d7b37c4dd4aa966c72a90d848c97ab78828b96a2481eb3a7988546a3f7889c
+size 109436
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.DM-Room.png b/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.DM-Room.png
index 403c5a3d8..93639734f 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.DM-Room.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.DM-Room.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:129d810b162ed47cee6b8e3290d42856978dee372ec4ab9f30bfa86f741dc634
-size 172303
+oid sha256:51316c0a9133039fc1c7a3cf685bc65ffa22c9af0245624b0e4a5cdc9d22f4ce
+size 172308
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Generic-Room.png b/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Generic-Room.png
index 21e1f5b25..687340900 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Generic-Room.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Generic-Room.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff01af3ff469adc7af06dc12854460ccf852b8cf0bdbf31182963955154f8b1f
-size 175557
+oid sha256:40b59c0b5ae823c10aa9e471a8f445a806dc62d7f1d2838d9e4da03bac345059
+size 175568
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Simple-Room.png b/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Simple-Room.png
index c2646c512..eaedbd416 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Simple-Room.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Simple-Room.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d378850d9107beb3f9a7983a04767b06e413fca00897363d02b892b69a46adfd
-size 106925
+oid sha256:8ed061b73116d25b12c148d60944581f02ddff9a647f5d53eb61c129200f7b7a
+size 106938
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Account-Owner.png b/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Account-Owner.png
index ebfc5ec79..3ba99a0ea 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Account-Owner.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Account-Owner.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1dc00cb9ba0e7b711372fe608e292cbbdab23f459dfb764afdad87faf567faf
-size 127925
+oid sha256:f4bc9d97c5f1db7319056f80d1a2c8282d4d6f0cb74813a70d13b3728b3b912f
+size 127927
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Ignored-User.png b/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Ignored-User.png
index 7a80887e4..c844a5907 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Ignored-User.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Ignored-User.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a1e779faa6eda3ec330acbb10da4f65ec026d10721b4417a661249f8b5c3da3
-size 100378
+oid sha256:218609ca451f129fbefe9119d1e6a3e5b415f2da5939727f3061f0e6d2e31cce
+size 100394
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Other-User.png b/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Other-User.png
index 248206a5b..aa660f66b 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Other-User.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Other-User.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6001967eca419537b4e09c682a2f1842390507494d72eb80e54f500373afaa4
-size 139838
+oid sha256:3109727ecc950214a27eec0fda360df2816ddb7056c3b9048914575d70595769
+size 139833
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomMembersListMemberCell.1.png b/UnitTests/__Snapshots__/PreviewTests/test_roomMembersListMemberCell.1.png
index 1f73d0427..c638e060c 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_roomMembersListMemberCell.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_roomMembersListMemberCell.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:783b5a2ffcb1192cf9e92362c6b882cdc2c87dfc3e81bb5c343268589958eb12
-size 71396
+oid sha256:61d335b7118fa8c3c46490768ae6cca2611faf24812b21061e9d13eb5fa7d65c
+size 71383
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen.Set-up.png b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen.Set-up.png
index e22734de4..1213835c2 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen.Set-up.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen.Set-up.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdf6b26d4174ebe03ea0bdd51c2ba8ecd6b720dbc3bac3f6960bd6b305259cda
-size 150538
+oid sha256:f34bc615da090c2fb5065cc1f54ad7ea24325b45eda2a86ec79eced83954e912
+size 150523
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Incomplete.png b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Incomplete.png
index 146c4d510..5902435a5 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Incomplete.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Incomplete.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e555a2dc897f2b010e6d62f0595d51f892810ea81382d55bc067355d4118ec7
-size 106260
+oid sha256:d008d9474ae107ca66f04a476377fdcc310ba5b8af127b6ee93469c67ec0f789
+size 106279
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Not-set-up.png b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Not-set-up.png
index 490219038..9344692d4 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Not-set-up.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Not-set-up.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:013ef683c6abcc0a90e935797d7acfbccef806d806dcc527126dcda08e3f6ea1
-size 133333
+oid sha256:0503711a558d15afe8768c963947ee264638bcc9c355a88fed8ac2a6a9eecd64
+size 133308
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Set-up.png b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Set-up.png
index e3f930249..42c511d94 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Set-up.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Set-up.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0f9761d91b65d80356290996c1acb06848be21505c7fb1dc21faabc4e442c5d
-size 132839
+oid sha256:cbfd26dced936e9bc1dfc943b5c6edde7cc5834046c75392d179a98f940f14d5
+size 132813
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_shimmerOverlay.1.png b/UnitTests/__Snapshots__/PreviewTests/test_shimmerOverlay.1.png
index 9938f6f38..93322c406 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_shimmerOverlay.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_shimmerOverlay.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4eac89ed17c4e09dc7d03dcd59f770bd9dbe2e198db2b1d43981e7f8ad2c1207
-size 88113
+oid sha256:c241a1cfdf6fdadc9d8d46568930783f61c24348b76a9f663240e8508a90eb60
+size 88361
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemDebugView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemDebugView.1.png
index 61955b299..94aba23c5 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemDebugView.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemDebugView.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ffed2486877fd5cae6beebc1313f1c2333e9e58ee4f222874fd1f1e9677305f
-size 112035
+oid sha256:09c919e6b5a30d8c37b085045e6470263968a1a666e396e517a058718c0bcc9d
+size 112019
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemMenu.1.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemMenu.1.png
index 5e6e90980..5fbf1ada7 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemMenu.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemMenu.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b0ae9219b95452891d536ab89bc71ebfe6b5ef64070a35e275955bb331325ed
-size 148475
+oid sha256:7e61b6f920e8b7fe39b7991801d50b28e97ebc2166e8b842f9b1404e2c524d32
+size 150838
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.Threads.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.Threads.png
index 6796a893d..7a5fa4b00 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.Threads.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.Threads.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:33c4c1bcbc235818c6d57015334490ed610927cc81eeae48f92a93ef040907a0
-size 258728
+oid sha256:6972305327f7ee70b462d3b517c01c6f85d2f59ef43c9bf1f0e02685ccd49584
+size 296370
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles.png
index f3d673625..1823b9abf 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ec34fa70dca5b3eafe2b0b87659279ed37edb3c07f739794223df3f5ef03e79
-size 95434
+oid sha256:62e48c88e50fad2216db1cd6f5e3af64d4fe2c286316fccd9bb32f4b6f856ff3
+size 95205
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Plain.png
index 0a1a5f438..7897a743e 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Plain.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Plain.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb0e3b02b8b4e1fcaf169e2ed5b93c6dbe7df8d19d7c12d1f118e33a03b1b0af
-size 129381
+oid sha256:ec2229c6106f224648f1863c712f1728d3e94b13d823e8b9946675990d7c6788
+size 129177
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineReadReceiptsView.1.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineReadReceiptsView.1.png
index 9af29f501..61b5c9221 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_timelineReadReceiptsView.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_timelineReadReceiptsView.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:499defedee74cf7513d151514a1378a767aac471f288480a86ffaa3be4257f4c
-size 66169
+oid sha256:62627c50f97e678b23cbc2c47e5ba4401f34ad6b010c28b4990bf69c879c2229
+size 66101
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRecordingComposer.1.png b/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRecordingComposer.1.png
index b78c65aaf..2efe39f11 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRecordingComposer.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRecordingComposer.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ada032ec7d48cc981306ffaaa0be302a3edd5356d4d9c87257596ab0a9cce8d8
-size 58335
+oid sha256:c94407c5d923050cd7596f955dd664c21f0cd0e60862171d7f6c91c05869b0f8
+size 58358
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Plain.png
index 5ee59550b..8ce4e0a67 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Plain.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Plain.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e430f4465a8963c397f2bb3eb0a43487ba203a2190b3144a5202c920a658730
-size 67743
+oid sha256:d79313791794afe42511702f56435dd0ffa1158ffe7bfe495373c714040bc018
+size 67740
diff --git a/changelog.d/pr-2080.change b/changelog.d/pr-2080.change
new file mode 100644
index 000000000..fe6d3fbf2
--- /dev/null
+++ b/changelog.d/pr-2080.change
@@ -0,0 +1 @@
+Add SwiftLint rule to enforce stack spacing.
\ No newline at end of file