diff --git a/ElementX/Sources/Screens/Timeline/View/Replies/TimelineReplyView.swift b/ElementX/Sources/Screens/Timeline/View/Replies/TimelineReplyView.swift
index c3b6b6d7f..be6a6736e 100644
--- a/ElementX/Sources/Screens/Timeline/View/Replies/TimelineReplyView.swift
+++ b/ElementX/Sources/Screens/Timeline/View/Replies/TimelineReplyView.swift
@@ -19,7 +19,7 @@ struct TimelineReplyView: View {
     let timelineItemReplyDetails: TimelineItemReplyDetails?
     var maxWidth: CGFloat?
     
-    private let backgroundShape = RoundedRectangle(cornerRadius: 6)
+    private let backgroundShape = RoundedRectangle(cornerRadius: 8)
     
     var body: some View {
         content
@@ -29,7 +29,7 @@ struct TimelineReplyView: View {
             .background {
                 ZStack {
                     backgroundShape.fill(.compound.bgCanvasDefault)
-                    backgroundShape.stroke(.compound.borderInteractiveSecondary)
+                    backgroundShape.stroke(.compound.separatorPrimary)
                 }
             }
     }
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/composerToolbar.Reply-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/composerToolbar.Reply-iPad-en-GB.png
index 8af3f72a2..d835158a6 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/composerToolbar.Reply-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/composerToolbar.Reply-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e26965b752ba937daa43aa9968c34df7f3fcc6de55aece0587be7a5401f668e5
-size 93829
+oid sha256:c69448eb4adca8eba15dcea1e4b547d72b06a544eea1f64c53fb1acac3e917bd
+size 94802
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/composerToolbar.Reply-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/composerToolbar.Reply-iPad-pseudo.png
index 674a14327..c9c16c0f1 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/composerToolbar.Reply-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/composerToolbar.Reply-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9111498f1151b9c79dca8de75acd398b3f91b6aba1831052f92dc79dab4aebea
-size 94638
+oid sha256:27fd65c9dc74da6d00fcaa03fa725d622ccd831609d79b8bb4b1f46b1171787a
+size 95597
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/composerToolbar.Reply-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/composerToolbar.Reply-iPhone-en-GB.png
index 3fd8e1814..a774b55a4 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/composerToolbar.Reply-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/composerToolbar.Reply-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ddafeda34e05246030b24e2552bdbab5d9a0aa0ea4670e8002ab4816843602b8
-size 51811
+oid sha256:be3aa1854d2389a8da30fb060eb386abad6ad9be242d92716728fdd6b8bfe4fd
+size 51744
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/composerToolbar.Reply-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/composerToolbar.Reply-iPhone-pseudo.png
index 609927a18..19978d7ce 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/composerToolbar.Reply-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/composerToolbar.Reply-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e54d5e504f21680c2ca362b205e3729e07f86c5c87e746e756b2516529cd88a
-size 52581
+oid sha256:3ce7264a0e6f7be21822421e564c2d29f41c548af1e3a3c3478c49c51a7b0a3e
+size 52505
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPad-en-GB.png
index 81abe5835..bba703947 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65ab004d023cb309220f9df6e9dc3126cfb31d252b4d7d6aba543ce2c10ad206
-size 2183435
+oid sha256:1c6038d846132e778a87f9b0c092b4b73a569cd6d549a3f8fc29aff57f2b6976
+size 2184702
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPad-pseudo.png
index 3549d9e71..2f5433dda 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be432c88671b1c907955e49c1b3bdd0ec8586bfd51d03950d4772588f4c671ed
-size 2211947
+oid sha256:18659469e7bc5d5efc6d35efdbd8576f58efa3b0a2ec4874d7d5fae3bb29cf47
+size 2213199
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPhone-en-GB.png
index 37d166fd9..b88592924 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b380179dcc7e86b16651dcae880071124088604f89a58ba69cde77f16deb641
-size 947975
+oid sha256:a942a02296d2f4adc5edb447727786158e0079ca1f88980f7a60b79463bf4f41
+size 949091
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPhone-pseudo.png
index 0f648a3fd..40c951aee 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae4b809327dac37e277c55a989b1f97aa3cd3efd78b1782ee0f68c4058dffc48
-size 979991
+oid sha256:c91b60cc3fc131aefef8a8f079b615644e3c88aef360687cabaa54e006916eee
+size 981067
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/locationRoomTimelineView.Bubbles-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/locationRoomTimelineView.Bubbles-iPad-en-GB.png
index f47f8a263..f63756118 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/locationRoomTimelineView.Bubbles-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/locationRoomTimelineView.Bubbles-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b8e1da549bebefa2452f375d0c14a195d4e985ac9cb7841b36121107787d043
-size 1295023
+oid sha256:83fe2d86433a391a75c280771253f7ec9b1086b744e29f3acae04d99ce12d9a3
+size 1295097
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/locationRoomTimelineView.Bubbles-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/locationRoomTimelineView.Bubbles-iPad-pseudo.png
index 3e82d2e69..35452c435 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/locationRoomTimelineView.Bubbles-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/locationRoomTimelineView.Bubbles-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7dd31cdcf9a2f90466254b2d82f96287884d0a36551fdf825c211736e817eb3a
-size 1298213
+oid sha256:2f6a979e285b19df414838bc6aa2ef9b28b387a8e720a3d68a92dd9d271430dd
+size 1298265
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/locationRoomTimelineView.Bubbles-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/locationRoomTimelineView.Bubbles-iPhone-en-GB.png
index 30cb3434e..e41bcbe3e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/locationRoomTimelineView.Bubbles-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/locationRoomTimelineView.Bubbles-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26e5ccab47d30ce36dc519114ee5d487e113ee95d2601f42a5efbd1f8f24f547
-size 574401
+oid sha256:2c9dc6d890f24df476cd8f548527d9511bc451e20d13ff0180f6201fa88fb62b
+size 574858
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/locationRoomTimelineView.Bubbles-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/locationRoomTimelineView.Bubbles-iPhone-pseudo.png
index f8eda9454..63e3f7187 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/locationRoomTimelineView.Bubbles-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/locationRoomTimelineView.Bubbles-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b4ab15d397ed6bfc8f9b3c723ec692f26fe5115d87e6963b372de472d9de775
-size 575953
+oid sha256:65ffe895a14c6a0ba3cee6c8812f626bbc98b143a2dc77f1ec5ac001fb8d0884
+size 576433
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-iPad-en-GB.png
index 822bfda03..6611ac461 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d1cee861368f1ff16fe9046f94033574f715b9cc517246eafca1b8d5ad2b52d
-size 205021
+oid sha256:5c8a857dae31064b18d93cf43328ea118928ac9fe3a06bfe0bcd0d906febfda3
+size 208200
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-iPad-pseudo.png
index 0d22b1d14..eda7368ff 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6db9d709a5e97790d355d95f22432984964294c7a923f002d282ed19a3edf835
-size 208254
+oid sha256:fb040300943d7704cb239ee113c284d9260102e0e7656fe0872af4a917a6e754
+size 211452
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-iPhone-en-GB.png
index 5e634cf4a..f00660c7c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9474ca31071c9dafb275f1c00245d63590f2d3b6cc063a8193c38abb83f70720
-size 144717
+oid sha256:039e93b80f2678cf4dfd8a8c1adebbfaa78f0216a7994242fd3ddf67373ffb35
+size 144187
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-iPhone-pseudo.png
index 894529cf8..6f6920c44 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:240cbd13759c06666d4cd34d23e054b2166a115ad0ea878619e1a19563765394
-size 147531
+oid sha256:1ac6fa4b10d58dba9587811b246322436b3f5f67012b106ea9c9be3242ca93cd
+size 147015
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-in-thread-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-in-thread-iPad-en-GB.png
index d99501cea..5c98af13a 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-in-thread-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-in-thread-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:45146b4cba38e487a255a30f521274416921068cf75d640cf7a153139c7239d5
-size 212374
+oid sha256:f0765128bc75356a31d15379398401c374a55a7daec3b01e32c082d25e0d276b
+size 215627
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-in-thread-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-in-thread-iPad-pseudo.png
index 7c966dcbb..dbc122a7c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-in-thread-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-in-thread-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53068a58b7f9f8c338c7fe528da9c0115f91df80c1de27cd33c1c8aeaf9228ea
-size 218748
+oid sha256:f4fd72d292f95d7ce31d5d3c5620ea74bcc673bbb4fb9f707ad1b4d0f3169f7f
+size 221936
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-in-thread-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-in-thread-iPhone-en-GB.png
index e0a27d632..06e248c6a 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-in-thread-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-in-thread-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6727a8eb29ec64e3a1065c7564aed13db06059fe8b3863d433cb41a4162f66b3
-size 149930
+oid sha256:dc7fb16c53cd48b9eda2d2147a84c0f655c745d99b0f6c281326a954b6b55a4d
+size 149415
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-in-thread-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-in-thread-iPhone-pseudo.png
index b4970508d..4fab44e55 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-in-thread-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.Replying-in-thread-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:864f452d4ca827d1e64b2a3345b6c09a45108ce087640d4b8075820003198348
-size 155737
+oid sha256:1560fc65429790f09040f72965f39318d2a8c4c4c7a50b231fa59365bae13dac
+size 155153
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.iPad-en-GB-0.png
index 43be26f01..83175687e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d9b0281055ab7105b20f42b5b39e4ad5dbff2ec1d2638aabae2ba89c4dc0af24
-size 147525
+oid sha256:545411b9a3cdfefc3c510606d4e10370d01e6ba680c5c4f7d27b2f6134574ace
+size 147912
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.iPad-pseudo-0.png
index 5f5d5319f..702feb40d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3692e5c7d1b4b602dd8b6283873729f0f40f37fe856c0da00ed0303e07a06b7
-size 151966
+oid sha256:ff0d0b66fae6003f0b2b9f0e09ba874708f40940ead123ee314673e03a4d52bd
+size 152351
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.iPhone-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.iPhone-en-GB-0.png
index 09fe5ef99..0bfcf145d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.iPhone-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4edf15a40751f33aabbb280b3cdddafe8a2f4ffe099f06dfd4b568d45e3ec871
-size 103665
+oid sha256:3c96e12790cec548d79f12738e7204d10dfebc41bb9246a418ceb7bda605e4ab
+size 103583
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.iPhone-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.iPhone-pseudo-0.png
index 0f9ae59df..82c554bec 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.iPhone-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/messageComposer.iPhone-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad300dfd808122db80492924a4eefcc18b58b1a39b71b61920a173f7ff7e2b6c
-size 109135
+oid sha256:934401ad9add758df2f24dccf72b045eb19b038ad735b4b2d3d5b8225f487d31
+size 109057
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Replies-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Replies-iPad-en-GB.png
index f834d15c0..996c7f107 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Replies-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Replies-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:003a4fb61c12b5b5c7c7a64d1287f76255bd4e43e92d394950781cb21a38ad1c
-size 108333
+oid sha256:6913e3d8c812cb06cd275f43526493017ebb577448ecf8cac051dd6a20d2ad7c
+size 108141
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Replies-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Replies-iPad-pseudo.png
index 05136731e..ddaecd3f1 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Replies-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Replies-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f60177b382250855ad1fb33c1a689b16cabdcf7fd409eb19b9706abe0bc771f0
-size 109793
+oid sha256:e6614e82ce901b22575734990e9087f78aecc20934f20eae6105654516e77c2e
+size 109667
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Replies-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Replies-iPhone-en-GB.png
index 911a67798..c42485a63 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Replies-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Replies-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7893dab6bb88391ed28a2a0d28d96ed91a4316f3ac6f0eea7228326510b25c05
-size 66251
+oid sha256:e99f06df426b56abb67f92157641fb51366368c2397ef33b5047bc3398fe3c5e
+size 66255
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Replies-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Replies-iPhone-pseudo.png
index 2c9d30423..35a736fa8 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Replies-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Replies-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:323b44563b36b34c5a1194648b2c4cd8ddce10237b316c8cb7fc0452ba8bbcb5
-size 67351
+oid sha256:b4a9a0c8f97c94ac872968edf489dcc3323c6e884755012cf69cb58b073a34fe
+size 67362
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Thread-decorator-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Thread-decorator-iPad-en-GB.png
index 1f283c204..cd962ab38 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Thread-decorator-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Thread-decorator-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eeb5bf3b6588dc634f54d23dbc3b520b6bb06b6401c43ba7cff72597fc8166dc
-size 1917403
+oid sha256:d20b75600a8bff48e9c30ba555991be0fc359780e566915cafb63fe10b9040ab
+size 1917027
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Thread-decorator-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Thread-decorator-iPad-pseudo.png
index 3d8c08bdd..ef709a6ee 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Thread-decorator-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Thread-decorator-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ed1bac359755669967e1472772d553be02c90fbc7041f3581dc5cf679db14bb
-size 1924082
+oid sha256:ed0d360057ff246718bb7867be39739de54978e30abde661ec661b7b5db967bf
+size 1924111
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Thread-decorator-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Thread-decorator-iPhone-en-GB.png
index d5ea3dadf..fe188c444 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Thread-decorator-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Thread-decorator-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:327806fa611e870614d0293d17fe76e81cd7f1826ef5e17db85dd3af15cd88b3
-size 868753
+oid sha256:0208e4cd1ab7a259f49197dfdfe01035211d6d7224509b9086fe9475b7e9c1b1
+size 868252
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Thread-decorator-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Thread-decorator-iPhone-pseudo.png
index bf5c92723..9a24ec188 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Thread-decorator-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineItemBubbledStylerView.Thread-decorator-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd2534d1c9781045b71d423e8b62ce82945b281e9dce1d881af92372dcedc8b4
-size 872302
+oid sha256:ac4ef3830d18abb3555811f71ca3102618e3b24ad1e3358b6e71b1c0a84ea2d8
+size 872057
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineReplyView.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineReplyView.iPad-en-GB-0.png
index a150dd0a3..2ae42df50 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineReplyView.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineReplyView.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:72dae82ccc4c09e3bba05309cdfb924779cd999c27f2f47c21fe8dc4f72827f1
-size 270105
+oid sha256:3b3f9a8c7f77d7caa9e82ee6220606656a84ade96936f73369f651544676dc18
+size 270385
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineReplyView.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineReplyView.iPad-pseudo-0.png
index fb049c809..f9ddbe047 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineReplyView.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineReplyView.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d007db9851a4c9e95619b230ece6a4839180b37361e4edb0945d19f845668080
-size 280093
+oid sha256:f39ec46c047b8753fcb961a3c341de523de9fae4f76405240d01108daeb65127
+size 279803
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineReplyView.iPhone-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineReplyView.iPhone-en-GB-0.png
index 7716c9a7c..96a597f6d 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineReplyView.iPhone-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineReplyView.iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42be9887bb0987f44f393a898b8873983bb76019eb142ae701ed4263d3203d0f
-size 191898
+oid sha256:40dd5c70e527101dbde5ad0bc9d307a81ea8a5b57cca3d96b1216ff6b417150f
+size 191644
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineReplyView.iPhone-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineReplyView.iPhone-pseudo-0.png
index 2ea3135d6..ec7dfed78 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineReplyView.iPhone-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/timelineReplyView.iPhone-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d59bc84ed5b597804790fb1ef0ee0eeb098dfff11518dc932062287090bd5c5
-size 190260
+oid sha256:c55b9bc0b2dd96b0d7809119c288df4a1b1b3602a5c4d61e4e6fb1dda71b4fe3
+size 191806