diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift
index 8173d36993..85d84e95e8 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift
@@ -55,7 +55,7 @@ struct TimelineItemPlainStylerView<Content: View>: View {
                 if let replyDetails = messageTimelineItem.replyDetails {
                     HStack(spacing: 4.0) {
                         Rectangle()
-                            .foregroundColor(.compound.borderFocused)
+                            .foregroundColor(.compound.iconTertiary)
                             .frame(width: 4.0)
                         TimelineReplyView(placement: .timeline, timelineItemReplyDetails: replyDetails)
                     }
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_fullscreenDialog.1.png b/UnitTests/__Snapshots__/PreviewTests/test_fullscreenDialog.1.png
index 3ca074c6ea..9f2dbc069e 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_fullscreenDialog.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_fullscreenDialog.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3cccc8d5928139de2f6c3b6a253485ebbe89af4ac395356b6b07853c3894654
-size 125092
+oid sha256:e6c3917e9e6f95e593b41bf143aded09d0a252e594ccd292babdb012fea5c076
+size 125968
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Plain.png b/UnitTests/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Plain.png
index b603e2d43d..592f654dbb 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:181d95114288170d533f21560d08b6e640e0dd6080fa946972c5998769933613
-size 1291613
+oid sha256:a10530690e2b2b934bc6bcf430b928bf25233f0dbd5d8799a4a726ba2c1b65b1
+size 1291612
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Credentials-Entered.png b/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Credentials-Entered.png
index cc59b282a4..6425e5d145 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Credentials-Entered.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Credentials-Entered.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3dda276cd65cc15a2dfd5612d96ed6cd01911a9695a44f0d783164c8a0a4a935
-size 94039
+oid sha256:e753bb4e5e15d15db7ad5074477521a8222109668d8c6a3dd542ef1fe553eed3
+size 95450
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.OIDC-Fallback.png b/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.OIDC-Fallback.png
index feb35660e5..106ceb5adf 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.OIDC-Fallback.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.OIDC-Fallback.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73ec305889896c23ecea7e1676afebe659be139555b96bca4ebb942cf6454762
-size 96850
+oid sha256:b0daac359ce0829a4aeaeebad81686a56602326bfad52ee180ac989852b8f362
+size 99790
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Unsupported.png b/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Unsupported.png
index feb35660e5..106ceb5adf 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Unsupported.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Unsupported.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73ec305889896c23ecea7e1676afebe659be139555b96bca4ebb942cf6454762
-size 96850
+oid sha256:b0daac359ce0829a4aeaeebad81686a56602326bfad52ee180ac989852b8f362
+size 99790
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.matrix-org.png b/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.matrix-org.png
index feb35660e5..106ceb5adf 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.matrix-org.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.matrix-org.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73ec305889896c23ecea7e1676afebe659be139555b96bca4ebb942cf6454762
-size 96850
+oid sha256:b0daac359ce0829a4aeaeebad81686a56602326bfad52ee180ac989852b8f362
+size 99790
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_onboardingScreen.1.png b/UnitTests/__Snapshots__/PreviewTests/test_onboardingScreen.1.png
index d1978b5b6e..0be0c8aed2 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_onboardingScreen.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_onboardingScreen.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:62943be9f4713c99206f3a046dc6d1356033d66fe0619b67445801a382d9e8ed
-size 827274
+oid sha256:5f932bf95aeacda33b053111d5db67dacc992eb8cf3daedd193bc54c3edfc658
+size 828166
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Login.png b/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Login.png
index 1827540f78..14425d6e2e 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Login.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Login.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26504c75ead0a0d9fe59a56eae78a12da4886e75124d26fbd3c49803be71088d
-size 109519
+oid sha256:5198bfc655966b30e0df00eebf396a3ee1ac3959cf50c8f6683c0d4e60d3ba66
+size 110527
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Register.png b/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Register.png
index 15c390eaad..9a23f0311a 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Register.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Register.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdf6da0f23816c09e9eda1c18bb7df4fa586a1ed15f4bd7c325d8fe8ea891724
-size 118019
+oid sha256:e80f48d1d67784f0de9195048a36a0060d6dfdbab638ef02d4da7148fa5de76d
+size 119018
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.1.png b/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.1.png
index f9007e287d..76aa37cad1 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9cbf2e502cdb3f9f297e3f753677acaa97702ea60e0c97f8f374c8b97fefa27d
-size 124162
+oid sha256:3f500a57177ebf155c58c2210f244c454412a0367ed1b84f8f9bdfa5546d7c49
+size 125330
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.2.png b/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.2.png
index 8ef17d4b7e..cf426b9a11 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.2.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5cd81d9d11ecd3877eb64e1af288eb6a5058e500267cb287354897493bba1f8
-size 118908
+oid sha256:b738b5877dbacd7095a1d3d5d8dd003b87fc3881bbf409caeaf6752103247a66
+size 121504
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.3.png b/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.3.png
index aa878bcb48..f2d45a0bec 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.3.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4144356d079e8526748fbc7db00528d848b26b12741d58a1b598dfce8213301d
-size 104176
+oid sha256:55e47ae6a4a8cf245861489b96ac3b0e292973d408fe35ad6cbe2741599b6665
+size 107793
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.4.png b/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.4.png
index 74ee3bac29..1b98c01000 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.4.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.4.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9b2b5046d1241cd3c4920fe0e5bd8b927092ec9bad4368d27e224e1d620370b
-size 120096
+oid sha256:39c36b97fa5568a8045774eff3a9b3990b23964801f664dd0e19077ad83fc7b4
+size 121311
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Cancelled.png b/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Cancelled.png
index d91c8f2ddc..bc001bec54 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Cancelled.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Cancelled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f43f990e068eda0b66d8b9acb8f2f3418b6ebd8039fd54d44873c3c99e67761
-size 96767
+oid sha256:0c0db081b11178c40bb1786978735bd779e6a9e5da261cb735d9d907487f5279
+size 97737
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Request-Accepted.png b/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Request-Accepted.png
index 383b07cd9c..ad869d7792 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Request-Accepted.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Request-Accepted.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac861ab88ea57e82e9852a24fe3ab9091fc5cc7470806177cccd53724ac55817
-size 94616
+oid sha256:846e9447940ccf23f4944b78e2e730c716a1811fd37151ac26ed4efa2d04e7eb
+size 95667
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.1.png b/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.1.png
index d7810eec9b..87b712dee8 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9a52b60299bd3eeb4031e35baec18720c950e424f400db9d205a39b4572c2a8
-size 168665
+oid sha256:a61a5e351914f6d0b9bed9c05faba5f2cb04b1aaeb215e01df3c6c3081ead611
+size 171226
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.2.png b/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.2.png
index 1140372c27..347f7f4ed4 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.2.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6254e617e3d0f62f50c101f45f175f7a49f1c2b547fb7a5ad5cccffb61196ffd
-size 166012
+oid sha256:c8935200eaddcc76d4889dd85d265d2bc3e6ea4ac9ea2e1d706f932e44ff4504
+size 167775
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.3.png b/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.3.png
index 14a036cc87..8dcc16c1fd 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.3.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f897c947473966955b3a6512af183d3edeac0afed71a7905f0a72652d10d61b0
-size 157209
+oid sha256:034a759c9db8e63715209135e6ae34cf7efaedef5ee971a73c674c007952d2ef
+size 158800
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.4.png b/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.4.png
index 114f516cda..e7fd770c58 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.4.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.4.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5de934d4a60d3f5dcad141dbf2878c6a2aa7f5995f8ff633950bbdebe862a0b
-size 162085
+oid sha256:3c32df089f70106a4852d21d858ab83fbc6e842c1e34f1ebb0b286c843f4b486
+size 162893
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.5.png b/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.5.png
index af6e99604f..3b32bbca93 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.5.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb9b86220b2e7dda7e8354deb8a5ddbd38984b97429133555f7caf83191fbd20
-size 199745
+oid sha256:7073562f30ebeb8a4fbb0beeccc9de1e540f1148048ab0acdfd7e730943da1c5
+size 202430
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.Threads.png b/UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.Threads.png
index 1eaa4819c6..6796a893d6 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:0f17d00d726a34f0b9949cfd98aac4e0c22e15063ca13882b0c875c8001b61f7
-size 258723
+oid sha256:33c4c1bcbc235818c6d57015334490ed610927cc81eeae48f92a93ef040907a0
+size 258728
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_waitlistScreen.Success.png b/UnitTests/__Snapshots__/PreviewTests/test_waitlistScreen.Success.png
index b5322bcf53..991bec7aed 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_waitlistScreen.Success.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_waitlistScreen.Success.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04bbb0e08ca720e623511340f8e22972ef64c79fbf931766a07d93290f4df8a0
-size 520204
+oid sha256:a4b6b5f6c741f9f491975b83cdb534f329964638b59c6e310ffc0339edfddf88
+size 520952
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_welcomeScreen.1.png b/UnitTests/__Snapshots__/PreviewTests/test_welcomeScreen.1.png
index e1a7051601..1eb37ac133 100644
--- a/UnitTests/__Snapshots__/PreviewTests/test_welcomeScreen.1.png
+++ b/UnitTests/__Snapshots__/PreviewTests/test_welcomeScreen.1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56441b160222e3b233cf3bd53eb59d9f3169852ba46060dfd980dbb0c27f459a
-size 814992
+oid sha256:e6a741c97d018b4f426917faa6960139b4bdecd22ee32c4b44af4d5b458e5b9d
+size 819195