diff --git a/ElementX/Sources/Screens/RoomScreen/View/TimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/TimelineView.swift
index c1979eab7f..13149cf6b7 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/TimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/TimelineView.swift
@@ -33,43 +33,30 @@ struct TimelineView: View {
 
     var body: some View {
         ScrollViewReader { scrollView in
-            ScrollView {
-                bottomPin
-
-                LazyVStack(spacing: 0) {
-                    ForEach(viewState.itemViewStates.reversed()) { viewState in
-                        RoomTimelineItemView(viewState: viewState)
-                            .frame(maxWidth: .infinity, alignment: .leading)
-                            .padding(timelineStyle.rowInsets)
-                            .scaleEffect(x: 1, y: -1)
+            timelineScrollView
+                .introspect(.scrollView, on: .iOS(.v16)) { uiScrollView in
+                    guard uiScrollView != scrollViewAdapter.scrollView else {
+                        return
                     }
-                }
 
-                topPin
-            }
-            .introspect(.scrollView, on: .iOS(.v16)) { uiScrollView in
-                guard uiScrollView != scrollViewAdapter.scrollView else {
-                    return
+                    scrollViewAdapter.scrollView = uiScrollView
+                    scrollViewAdapter.shouldScrollToTopClosure = { _ in
+                        withElementAnimation {
+                            scrollView.scrollTo(topID)
+                        }
+                        return false
+                    }
+
+                    // Allows the scroll to top to work properly
+                    uiScrollView.contentOffset.y -= 1
                 }
-                
-                scrollViewAdapter.scrollView = uiScrollView
-                scrollViewAdapter.shouldScrollToTopClosure = { _ in
+                .scaleEffect(x: 1, y: -1)
+                .onReceive(scrollToBottomPublisher) { _ in
                     withElementAnimation {
-                        scrollView.scrollTo(topID)
+                        scrollView.scrollTo(bottomID)
                     }
-                    return false
                 }
-
-                // Allows the scroll to top to work properly
-                uiScrollView.contentOffset.y -= 1
-            }
-            .scaleEffect(x: 1, y: -1)
-            .onReceive(scrollToBottomPublisher) { _ in
-                withElementAnimation {
-                    scrollView.scrollTo(bottomID)
-                }
-            }
-            .scrollDismissesKeyboard(.interactively)
+                .scrollDismissesKeyboard(.immediately)
         }
         .overlay(scrollToBottomButton, alignment: .bottomTrailing)
         .animation(.elementDefault, value: viewState.itemViewStates)
@@ -78,16 +65,19 @@ struct TimelineView: View {
                 return
             }
             let offset = scrollView.contentOffset.y + scrollView.contentInset.top
-            let scrollToBottomButtonVisibleValue = offset > 0
+
+            // We give it a bit of tollerance which solves the issue when of it being displayed when the keyboard appears
+            let scrollToBottomButtonVisibleValue = offset > 5
             if scrollToBottomButtonVisibleValue != scrollToBottomButtonVisible {
                 scrollToBottomButtonVisible = scrollToBottomButtonVisibleValue
             }
-            paginateBackwardsPublisher.send()
 
             // Allows the scroll to top to work properly
             if offset == 0 {
                 scrollView.contentOffset.y -= 1
             }
+
+            paginateBackwardsPublisher.send()
         }
         .onReceive(paginateBackwardsPublisher.collect(.byTime(DispatchQueue.main, 0.1))) { _ in
             paginateBackwardsIfNeeded()
@@ -97,6 +87,21 @@ struct TimelineView: View {
         }
     }
 
+    private var timelineScrollView: some View {
+        ScrollView {
+            bottomPin
+            LazyVStack(spacing: 0) {
+                ForEach(viewState.itemViewStates.reversed()) { viewState in
+                    RoomTimelineItemView(viewState: viewState)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                        .padding(timelineStyle.rowInsets)
+                        .scaleEffect(x: 1, y: -1)
+                }
+            }
+            topPin
+        }
+    }
+
     /// Used to mark the top of the scroll view and easily scroll to it
     private var topPin: some View {
         Divider()
diff --git a/UITests/Sources/RoomScreenUITests.swift b/UITests/Sources/RoomScreenUITests.swift
index 5039989ca7..18c13d254d 100644
--- a/UITests/Sources/RoomScreenUITests.swift
+++ b/UITests/Sources/RoomScreenUITests.swift
@@ -75,8 +75,7 @@ class RoomScreenUITests: XCTestCase {
         try await app.assertScreenshot(.roomSmallTimelineLargePagination)
     }
 
-    // This test is DISABLED because it's flakey on the CI
-    func disabled_testTimelineLayoutInMiddle() async throws {
+    func testTimelineLayoutInMiddle() async throws {
         let client = try UITestsSignalling.Client(mode: .tests)
         
         let app = Application.launch(.roomLayoutMiddle)
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomEncryptedWithAvatar.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomEncryptedWithAvatar.png
index edcf0dd983..8d6d614daf 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomEncryptedWithAvatar.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomEncryptedWithAvatar.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1de36174221c11e943109f468dca4ee795cb8ca90313d7ed9c01814a736f32c1
-size 296863
+oid sha256:30475c79a8c5b5073140e1871d1ae94d92b9284043f8ae9bbba397167a391a10
+size 297116
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutBottom-0.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutBottom-0.png
index 95f4507126..4eee79c118 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutBottom-0.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutBottom-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:598c465b0836e4353c38865283f8e1f1d6377199d7ce4dbd222ed5f99dcaf9ee
-size 296712
+oid sha256:b4a6596df37c3a0cc56eb999e8aab2aa0589b0ffebded25fbaa7fc0f128ce2f6
+size 350997
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutBottom-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutBottom-1.png
index 8664278c5c..1713d92ec9 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutBottom-1.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutBottom-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d482047d42e6a309b41ad59f0175ea8ab69fba3c94e2ca432d30e32d5f7f12ad
-size 300547
+oid sha256:6de5d464a4b1f8981e6006ddaea668d01a2366034dc2565531e6b9669eb24d71
+size 326455
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutMiddle-0.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutMiddle-0.png
index fdccb5b43f..69a0b4b7f2 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutMiddle-0.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutMiddle-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b90a3db3e871933aebf82e09b3cbadc29a3df17907a3de3e6f44af0242f57990
-size 298779
+oid sha256:3b0d03fc5e88ebddbffba3545514ab05c835b5f67ce067897252982093a4e104
+size 345733
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutMiddle-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutMiddle-1.png
index fce1598960..e9ca2e8c12 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutMiddle-1.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutMiddle-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27668b10edf831b7519d5197f810772b9a05d0f942fc9498d7f870ed193bdedc
-size 301821
+oid sha256:143706144c6c2c9772dfa984512559510e88b073164eb2c7b8e19d1300c0d86d
+size 358851
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutTop.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutTop.png
index ba7d6386cb..eaee0154ed 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutTop.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomLayoutTop.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:380e2a9d6e32d16ab8bb572d963cc9357baedf90f1e5ffc6180d30921a40a7e2
-size 300010
+oid sha256:4ef2bf1bddbac71de4fb5952bdb1a58c4f8107ca68323ad8ac4ff830ccf86066
+size 299747
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomPlainNoAvatar.png
index eae2e3bb52..bbc8e608e7 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomPlainNoAvatar.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomPlainNoAvatar.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28731b6aa52a65348cdb8f985e9458b8df8a276b467e88fc81be06019072909f
-size 296744
+oid sha256:7c9cedb545be38ec1ee87cf250adbc224648cf279119061beaeae3fc79a81fa1
+size 296869
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimeline.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimeline.png
index 0c448abc11..e80020c11d 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimeline.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimeline.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a5f0b64b13aca4627d5a986348fcf79d7c045b3f47f8a5c7841d9aecf7161aa
-size 99647
+oid sha256:df33d54cc39376676ef38e595b80afc3d0b798bf6618c9c008b95d5b6081a6bc
+size 99771
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimelineIncomingAndSmallPagination.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimelineIncomingAndSmallPagination.png
index 09c31f9f84..31f1aa421b 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimelineIncomingAndSmallPagination.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimelineIncomingAndSmallPagination.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20790e520cdf5bd805549a9f9cdeeff46468d29770a8dc2c450a195f8738e676
-size 122033
+oid sha256:0f0a01f0ff71de9b9c8e752482f030a4fe708c75c7c77f1d4b9512d187faabc7
+size 122124
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimelineLargePagination.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimelineLargePagination.png
index 3757a9f6e1..02ad6b98ed 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimelineLargePagination.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimelineLargePagination.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2f59c7f8ef1f17980f7c7fbc2f536e8c5c702f7f27025c6e7d831952cf60146
-size 295429
+oid sha256:bca42682b78ae09f9c892fc5664e8bb8f05ffd3eb7bfbe9e8253f0d43983c007
+size 327334
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimelineWithReactions.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimelineWithReactions.png
deleted file mode 100644
index 5eb0b019d8..0000000000
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimelineWithReactions.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d1dddcb5b5b2c22c08494e9f1d009a3d96f25049acd1ce39ce6c40681fb59bee
-size 290746
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimelineWithReadReceipts.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimelineWithReadReceipts.png
index cda01b816a..dcd097f91b 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimelineWithReadReceipts.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomSmallTimelineWithReadReceipts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f37882567402be92717592353be0450c91198a8bda0e1afe79bbcb112a34a868
-size 122953
+oid sha256:b0b0bdf4c6c574cc277ab6b4c05514e0b8499e549322fffdff890a379394bd05
+size 123073
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-1.png
index 7f70d8431a..d564c29109 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-1.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f47c0c687dee847461a81d16355e0e71f3e177cf032f208efc6fb61990f00651
+oid sha256:6a8185ab74026132241c02fd35d3efe9b8f4111d0041b3ab3f8748c92e1e36bb
 size 145285
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-2.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-2.png
index 85a7477485..046e6c8ac3 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-2.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c89c8f89743aac81ebfa8587b84d08ea316b131530aac175f185e956e2b1025
-size 332046
+oid sha256:ccf4fdcd745bd6d18438328bcc62610afbbfc44925a7533f874df938416a4f2e
+size 367558
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-3.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-3.png
index 45bdb3e5b4..44ee79a388 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-3.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.userSessionScreen-3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cac56dd13710ceadab95d95ad08be331ba8ec0a0a7dfcf8862061139c4e6b773
-size 401787
+oid sha256:fa886b79b67854f4a6bfa61ea20829df94890ffe7a5faf1e6280a18188843d35
+size 437425
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomEncryptedWithAvatar.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomEncryptedWithAvatar.png
index 2dc9f3c903..a0124cb365 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomEncryptedWithAvatar.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomEncryptedWithAvatar.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d8d79e503071161a1c4f93ddb5eceaa8093a5f03190f67674996a968403b9ac
-size 373443
+oid sha256:c5ce88752f3226663d777c42cc48877edb39059ac70b3790cbb9d40949bf450b
+size 516197
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutBottom-0.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutBottom-0.png
index de86b7489c..59586a6735 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutBottom-0.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutBottom-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3bea160c327552159b67779801e4b350c3e98a0901f76e47c2904fdd5870742
-size 304565
+oid sha256:5cd496003bb58476c26d03323ce364ea4c8e881e113781a81372f243a4191727
+size 430163
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutBottom-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutBottom-1.png
index 63f60b18f1..63e5a27124 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutBottom-1.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutBottom-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2c51895688a01680564323d008490b66fef8545b899578f398bd1c942f30939
-size 291085
+oid sha256:6610a02c243f8aa0b494a06fef42861ab18d6d4e4d8c886a3f2e0258540cc6bd
+size 408366
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutMiddle-0.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutMiddle-0.png
index 9886b798c7..63a67fbf71 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutMiddle-0.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutMiddle-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7a1628a641f59c4e39be0ab13864182526e4df5b11932f24519e99d00e4398a
-size 326226
+oid sha256:dccbc12f8cd5476d6c3f10dc44c85a6505b05290653e5ee9fd2ed31a3432cb8f
+size 424765
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutMiddle-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutMiddle-1.png
index 12ffe1f59f..9f3fd94013 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutMiddle-1.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutMiddle-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:935bd2ebed65e692fe2b79ba0e5d532681383807d63f630d7628a9efca087035
-size 328183
+oid sha256:f941a49c42577fc470859a69c5a56a83177e3515863e5f283e2e73f3d664a0c8
+size 435321
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutTop.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutTop.png
index 6ce6484f35..f9477d3cd5 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutTop.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomLayoutTop.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d677ce9a238c2c12499dbad35f56791b0a813cbb30526170f87e6211180c2d1
-size 307180
+oid sha256:08c2810e0aa77e6d421c760c2eb386a2d4d50eec77de0f5e5f42e615d5cc5a46
+size 306051
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomPlainNoAvatar.png
index f14f773930..00c3813b85 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomPlainNoAvatar.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomPlainNoAvatar.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a346d75dabdd2aa5bfffa9864f8f6ea03df2706aaf41b89cc8bbfaef813911c0
-size 373150
+oid sha256:f95077264f73dc9016199d0c9ac81cc9dbda9ca45db4d504f69f974c6049b3ff
+size 515634
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimeline.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimeline.png
index 93174c8aef..5e6baa0aba 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimeline.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimeline.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2355844ba8b1fba3b32c9f8be55b0856a36c3c9050d0a6a78074bff789611483
-size 155306
+oid sha256:b2087399b37bbdbaf41623811e04693a3eeceb44370e61501230a60bddaca1b8
+size 155464
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimelineIncomingAndSmallPagination.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimelineIncomingAndSmallPagination.png
index 2ce270dd25..1bb108eb94 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimelineIncomingAndSmallPagination.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimelineIncomingAndSmallPagination.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fcd1c188721d90400d301a6cc36b60a28b567b4b9791b73cd04d9c64b55d60b
-size 191746
+oid sha256:340f910b5523ce3d0ce93cba692735558b0a0544f6072e4e20d3f96d36fb714f
+size 191823
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimelineLargePagination.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimelineLargePagination.png
index a62e95e651..20a9157ac7 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimelineLargePagination.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimelineLargePagination.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c509e407519a7c3e60bd2d21ab187bd073b8c399d7f2fe676ea3a4780f05777c
-size 317557
+oid sha256:2f5dfbd07c51eeb4522cc170dfb52547e7b922fe71f1f25272f1a17c089364c7
+size 424622
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimelineWithReactions.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimelineWithReactions.png
deleted file mode 100644
index 4ef51239d4..0000000000
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimelineWithReactions.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02088ebf095f90a47b5690d08877e19bb3f9ff34685b3401b6d575a51d87d4dd
-size 372218
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimelineWithReadReceipts.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimelineWithReadReceipts.png
index f677d1883f..bdb205621c 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimelineWithReadReceipts.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomSmallTimelineWithReadReceipts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05801559dc85437238f11be12990e2deb45dec6764f40e8dadf04080d9da8158
-size 188412
+oid sha256:4cb9808f549261b80cdbe930e6d8bf15ad6ec3b98677058c8c9a34bceaadb850
+size 188531
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-1.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-1.png
index 641f8aa17d..bab43d87ea 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-1.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7721b60807f3d0e191c5e301fffde0c47fb87fc5ecdf24128f80376172364b31
-size 129688
+oid sha256:603b989b8cf85665feede8daa3b77d861ffb4655b75e97a92b6fa7fa9b75f586
+size 129689
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-2.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-2.png
index 11f0c351ab..5223cbea7b 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-2.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7101551413e7deb239f51948d08f84c84f749a5249f8693a8bf2ddd64ca683e
-size 301877
+oid sha256:85b8f43c54c72ca2effaf57d554de6302436674808a0973d6207df554993998f
+size 420125
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-3.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-3.png
index 8336d47336..d8beb6948d 100644
--- a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-3.png
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.userSessionScreen-3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a5661abcf45114e0fc838a2a46a4ab7e16ecb6744b77a0d04ac584ef96fc5c9d
-size 275046
+oid sha256:3f526bd11cfc2a9ae33af9aff9a41c18f9d79e368e31d7cb0a46437241e50332
+size 394650
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomEncryptedWithAvatar.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomEncryptedWithAvatar.png
index aee68cc4e4..ef4a4822df 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomEncryptedWithAvatar.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomEncryptedWithAvatar.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bed1e8ca4a425d95b51012d1f1071a4cae29e52d86b977fc2b4939907a10ed52
-size 297947
+oid sha256:c53121ff41117733e44f5dcc1f81661fbe74448c01ebba94c7954d300c104772
+size 298205
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutBottom-0.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutBottom-0.png
index 2566211253..694287e021 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutBottom-0.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutBottom-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c559b1d39337dcf3cd39154439bd2e8dbc3801e42ce66874966c9136b20e1c7f
-size 297200
+oid sha256:fa6c3dc4e0eabbc0a8e633de76cdd1d523d39d356590130f3cd1798e3bee0e83
+size 351481
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutBottom-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutBottom-1.png
index 892c6e4876..f947daaa22 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutBottom-1.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutBottom-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aaa4a6621f4cc0c595ffb1fff5071fc4efb7088abcbb7c294836dbb1b4df5b2f
-size 303088
+oid sha256:650e4a9a861ca1f6b1bb892ab0e01f76dc884aebf8ea351d67fb2acfea28c75f
+size 330385
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutMiddle-0.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutMiddle-0.png
new file mode 100644
index 0000000000..a039df8c9a
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutMiddle-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25d6c8939a3f2c7dddcbcff9be019ab89ac0b24ecb8b3477e8bfaaa7d73ef38d
+size 346218
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutMiddle-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutMiddle-1.png
new file mode 100644
index 0000000000..96b858fd17
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutMiddle-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b33e22d3248e639fd6169bd49fcf6eabc250bc0b346c0ddfa71ce1eb833487f8
+size 356377
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutTop.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutTop.png
index 183c7cbda4..667231fac4 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutTop.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomLayoutTop.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e185789c83db3017fe3070424fb8f2aa27b959d62e6eca6ba2a4dd96b21f4e7
-size 300452
+oid sha256:7c5697f227d2e6df0787a0e6d4a5c188e20a8d2c3029cde6602b601363905a37
+size 300190
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomPlainNoAvatar.png
index a49f89f0b5..b0fea96aa7 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomPlainNoAvatar.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomPlainNoAvatar.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1850339aab3fe5dcea8a3208bd2ff6b10bbee1af9f33f79c8346467365d47c1a
-size 297828
+oid sha256:f5f6b5d49d2fb2368071c97170bc42b29ea724f1a96390758d3badae605bf4db
+size 297952
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimeline.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimeline.png
index f95e16b843..20727a3f7a 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimeline.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimeline.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd4a9839f3c37eea4a8041b109de6aaa51ce62124839069c8c402fba0dc1cac4
-size 100114
+oid sha256:71cd100c502728d23de4c6c9a1cedf10b281d47bb5820ca7f6c4970a0e0cd561
+size 100241
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimelineIncomingAndSmallPagination.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimelineIncomingAndSmallPagination.png
index 791c4a6c2f..33161283c4 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimelineIncomingAndSmallPagination.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimelineIncomingAndSmallPagination.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ecbdb5dd52da1edf021e424e568340576e86a84bda85b9fe50906a01eb452da2
-size 122527
+oid sha256:113f8c550d1d03ec0095ab486639b4d2ece29d5942391933a3297407d8988e30
+size 122616
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimelineLargePagination.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimelineLargePagination.png
index 6e7384521c..ef3120543c 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimelineLargePagination.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimelineLargePagination.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:931a14b600650b557989bad6cc4e06ed6d4d4e9127c9f9ea6eff92aae77dd2bf
-size 295920
+oid sha256:f755ba0c1855d4c03512fe4d8e5df2e2e91444b9467c4effeb62b2957be47a14
+size 327835
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimelineWithReactions.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimelineWithReactions.png
deleted file mode 100644
index c893187df2..0000000000
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimelineWithReactions.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cb4e61ee05553aaa73b68656bac3f80538c8bba55d32c3de133a5c1fe8472d39
-size 291849
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimelineWithReadReceipts.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimelineWithReadReceipts.png
index af782e908d..1ce7de7567 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimelineWithReadReceipts.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.roomSmallTimelineWithReadReceipts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8d5058c62576818a6b434d8fbd8bce187447bdda8807f503d81e5bcec12aac8
-size 123919
+oid sha256:0de2427647ac1bf276cd508251c0b7ee3abe6a3af613f7d676d391d91c84de5c
+size 124029
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-1.png
index 2d33c5f138..2966758a20 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-1.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7636f881b8ffe54ae9d25b2fad515df66b22647f6916a1a137cba1c2992ddda4
-size 147141
+oid sha256:c28e96cf584d74a444264e7e7713b22d271375f09b7f6b398706e4c283c1c190
+size 147142
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-2.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-2.png
index 6ee68824d9..e612c727cc 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-2.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce321380a7eebcf955dd88cf6aa95e97c71f6130cdfb80cccfaf62054e803685
-size 334341
+oid sha256:787d818f49572922ff9e01608690234dc434d1f89e98279809d4da409a1bde72
+size 369761
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-3.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-3.png
index 81825b65f3..3677a8eabd 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-3.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPad-9th-generation.userSessionScreen-3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44353d365fc6a670dd199d18ff19708a12d91542854767b51e2847ad79a22883
-size 394487
+oid sha256:d27b8090022421ddbe235da9b8fd929086805cc49fedc86a730cb4b94aa8f3fd
+size 431930
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomEncryptedWithAvatar.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomEncryptedWithAvatar.png
index b1db42b186..13e8d815c2 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomEncryptedWithAvatar.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomEncryptedWithAvatar.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ed2478dfe1709d4bf89c14e4ef260bfbbb842c03d0cea6d582e2f83d4138aa4
-size 365987
+oid sha256:9b5d55a8550078de7a1d3bdf73bf9585040725cc05661bb109ea2bd63c6d98ef
+size 508107
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutBottom-0.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutBottom-0.png
index bdf065ef5d..ab2a9ee837 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutBottom-0.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutBottom-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c90352fa769e35f0cc76f5d58de65382b9f25e5238068632f75d2408056d6f30
-size 305156
+oid sha256:1bb16327656727348d7b4d03354843153a12fd68d6a5e836051ad00e15a7be85
+size 430749
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutBottom-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutBottom-1.png
index 6ba6cd054b..e4e354d6a0 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutBottom-1.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutBottom-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d2f71a72811d870047b100252cd9f0ee9a30fb68aceea47c7f826f87ca66737
-size 291795
+oid sha256:bce5567d7ba91090b14eada0d25c8f20b24404b9a62e8c73180d9d63f8a9148b
+size 409038
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutMiddle-0.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutMiddle-0.png
new file mode 100644
index 0000000000..6fe748a2ab
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutMiddle-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6a84ad7d884a59519a91d29e50bf733133be895ccec94bae469f59966e7561f
+size 425342
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutMiddle-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutMiddle-1.png
new file mode 100644
index 0000000000..62d3c910c5
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutMiddle-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e08810c191b8acc377ba450e004d555c0b2411027746130dcdac72ac88199d0c
+size 435939
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutTop.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutTop.png
index dd9fc65bc3..5a3659e20a 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutTop.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomLayoutTop.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b89762ee6f720c822772379d8772ab194d935e67e1cbe70ccaa975a11d3b7b7
-size 307700
+oid sha256:e917a63402fc03d3a844724c68d10093009f5da8cf0340ef2e16cfc99ae09772
+size 306563
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomPlainNoAvatar.png
index 800cfec4f6..d411a30d4e 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomPlainNoAvatar.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomPlainNoAvatar.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f1675bb9365c8c1f7e13ce74ea8b6c63cafb300ecfc61d73ed6d47358a8a877
-size 365694
+oid sha256:e7c6e558c1193a42a5dc098726f0e37d3c2f41dc2f6a4616d15fe2c71053d211
+size 507682
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimeline.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimeline.png
index 886b51a92f..4b0cd27aaf 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimeline.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimeline.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:95ac8a76988f1aa44217980cfc81cf363012b0c35feafc502d540ef088c43496
-size 155904
+oid sha256:5a6078f132d0239240488c520e63387fd9b6e03ff7a9997f993517cb16c47667
+size 156054
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimelineIncomingAndSmallPagination.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimelineIncomingAndSmallPagination.png
index f20d74aadc..8f9a9b71bd 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimelineIncomingAndSmallPagination.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimelineIncomingAndSmallPagination.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:47d40318d65ee97b89e1ee95244a8675d289d8d3f4a9a6807ec60b754d1ab962
-size 192323
+oid sha256:72de5da06e679eb213c1d671b633c0d14d0105f9db3f4fa4f7607f1824282978
+size 192399
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimelineLargePagination.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimelineLargePagination.png
index 3370fa1a08..36435404e3 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimelineLargePagination.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimelineLargePagination.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a78a3589544588de7141c2f8e2f833538a2e5903e5ae56dd83113b7aa873b73
-size 318113
+oid sha256:af555f689ceb82cb8eac2645d83ac69ade7b8b5d9b30ac5e7208919eff93743a
+size 425203
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimelineWithReactions.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimelineWithReactions.png
deleted file mode 100644
index 7faa43bd2e..0000000000
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimelineWithReactions.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b4f4f40e06cf45694cf98764839abb285ea474588387985a6caffb15aa604d0
-size 365475
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimelineWithReadReceipts.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimelineWithReadReceipts.png
index 4695e5328b..6fd9f8b4eb 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimelineWithReadReceipts.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.roomSmallTimelineWithReadReceipts.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3523b09f5942a8b416c2d16130aeec4a07d56d60222cbc01ad12136bfdba6fc7
-size 189768
+oid sha256:00cd5600d1b46ba4b01e0e887204a43fa410ac3ad493f3da0087ea511597dde9
+size 189915
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-1.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-1.png
index a5b1df9089..62ca8a8f35 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-1.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc63956c58db768d558a5ed58bc27092b448c8894a6f167387a058194d7934a5
-size 132854
+oid sha256:006f60c374a96f4346d77ce633b0c9ab2082e8af5c58e01c36bb3930c9b33ec2
+size 132855
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-2.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-2.png
index a5e91e3124..ca3024065f 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-2.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:995bc7dbdc8b76214520ddcb9ebb33a02c808fc51905d21405c52b418277b819
-size 303617
+oid sha256:4beeff6b0f3f6b5883748ec3676a35393acb40a86b281a7fcd8bf4650efb1af2
+size 421594
diff --git a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-3.png b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-3.png
index 95dd882e85..31bb57105e 100644
--- a/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-3.png
+++ b/UITests/Sources/__Snapshots__/Application/pseudo-iPhone-14.userSessionScreen-3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:47e700d939d38dcc1771d4db2037de9bddca67ac1e70da4d7eac92fe056275ef
-size 281689
+oid sha256:62a35f6898b807c2e017594df105d6745eb27f1d8133f19f53c2d3c904f24645
+size 403542