diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Empty-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Empty-iPad-en-GB.png
index a5b339a1f..072528f9b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Empty-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Empty-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8332e6211e8fdad7dd1623748771d2008c17c2d8193a3ffe957346c8d94f4086
-size 94641
+oid sha256:891746fb72e15eb52e9eedcb3577d374a643ee8123df2edad187bc867ee04399
+size 94527
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Empty-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Empty-iPad-pseudo.png
index a6445b31a..057cb8970 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Empty-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Empty-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa5e1fa38d7bbfadb55daf260435e11c9860ae1f63411dfb756cbcf6a50f70c5
-size 102168
+oid sha256:fa6f9ebe2d40bf3199338fba84304ce32798d7dd2b588b6d0166d86dbf2d3d59
+size 101479
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Empty-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Empty-iPhone-en-GB.png
index 9d0713129..fd2921cf5 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Empty-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Empty-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5fa800dc1baf2e5e52b39cdeb460d0463bde64f3ab721124050cfc992f308cf
-size 50335
+oid sha256:0cbe5bfc57b172f94dd553a9f1599026a77532d09494bce5a7ef001a50d38eda
+size 50188
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Empty-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Empty-iPhone-pseudo.png
index 93d69800f..fd2a06236 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Empty-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Empty-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98a12236fc3813000eec89080c4a5e6fb4414ab690750c0c9fbf6ddc79b5d7fb
-size 61874
+oid sha256:3c61bef04e3fc3c0babf3a1b2c80100d252a4b5803ec2ac8819e2007127601db
+size 61252
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Loading-messages-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Loading-messages-iPad-en-GB.png
index 0269dee21..2cb330548 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Loading-messages-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Loading-messages-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11753001e5dbeb4bf3d2b71991096ffacba68ac9e4b244763affcefca20567cb
-size 94885
+oid sha256:11f4fb72ae4e013ede2cf15badc4f606a63df54fa239aaf1495f63efcc546192
+size 79539
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Loading-messages-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Loading-messages-iPad-pseudo.png
index 7a646a095..f71147db4 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Loading-messages-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Loading-messages-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df702d4f0929233e211341424ff14f8ed6ff1f558f7dcbfdcc627338e0612c79
-size 103618
+oid sha256:d655d7715048faea691bac61723b170f09f0976a5bd30afce8e013fc8ca7dfaf
+size 83176
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Loading-messages-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Loading-messages-iPhone-en-GB.png
index 4d6edbfd7..9c0a168d1 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Loading-messages-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Loading-messages-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:759a3218edd55b0d4505108523f6d620a5db73fbf5f3b46ceb4f348e2b890486
-size 52394
+oid sha256:97fcf1b74fabdf20969a45ca0bf01d5d4fefeb3da0e59eeb4406f709f3c3bef4
+size 37375
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Loading-messages-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Loading-messages-iPhone-pseudo.png
index b681524b5..b8306404f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Loading-messages-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Loading-messages-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fd7cdf5319f41f891a6577565db68863f002c1fec23f7be265e039d3a51aaa9d
-size 62596
+oid sha256:108ad08965d887de946143b3b620e17449dd279e5b6f96af816d9cf3d153b9c3
+size 40806
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Messages-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Messages-iPad-en-GB.png
index 0269dee21..2cb330548 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Messages-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Messages-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11753001e5dbeb4bf3d2b71991096ffacba68ac9e4b244763affcefca20567cb
-size 94885
+oid sha256:11f4fb72ae4e013ede2cf15badc4f606a63df54fa239aaf1495f63efcc546192
+size 79539
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Messages-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Messages-iPad-pseudo.png
index 7a646a095..f71147db4 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Messages-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Messages-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df702d4f0929233e211341424ff14f8ed6ff1f558f7dcbfdcc627338e0612c79
-size 103618
+oid sha256:d655d7715048faea691bac61723b170f09f0976a5bd30afce8e013fc8ca7dfaf
+size 83176
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Messages-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Messages-iPhone-en-GB.png
index 4d6edbfd7..9c0a168d1 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Messages-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Messages-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:759a3218edd55b0d4505108523f6d620a5db73fbf5f3b46ceb4f348e2b890486
-size 52394
+oid sha256:97fcf1b74fabdf20969a45ca0bf01d5d4fefeb3da0e59eeb4406f709f3c3bef4
+size 37375
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Messages-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Messages-iPhone-pseudo.png
index b681524b5..b8306404f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Messages-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Messages-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fd7cdf5319f41f891a6577565db68863f002c1fec23f7be265e039d3a51aaa9d
-size 62596
+oid sha256:108ad08965d887de946143b3b620e17449dd279e5b6f96af816d9cf3d153b9c3
+size 40806
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.No-results-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.No-results-iPad-en-GB.png
index 657fc130b..272032585 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.No-results-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.No-results-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e2a5821c0b45c566cbf23b7fc4a20c89d944e3b7fa7d0e527976926fe162386
-size 94721
+oid sha256:47c0d85785474ad482e16c45d1a76101d04c229a46f6a7a105d159e509800089
+size 79383
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.No-results-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.No-results-iPad-pseudo.png
index da5986713..4d79077a1 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.No-results-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.No-results-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a31e6c8f3c6c12244291dfbe8796d46e68f77b7f4601bd6af8ef248024ce84c8
-size 102826
+oid sha256:3c54d206972724b048cd4a35dba8e9373b384c6b48847beaf7abb64dc15505d7
+size 81556
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.No-results-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.No-results-iPhone-en-GB.png
index 46e831804..9ef302629 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.No-results-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.No-results-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09248c6998a1e731ed447c927f2f8a03c3ed72083090f56a8d8864d2d51db579
-size 51932
+oid sha256:5e71048e4fc798d6a008802496a4fffd958330b36a3e8be7cc5fed4a0b84933b
+size 37231
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.No-results-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.No-results-iPhone-pseudo.png
index 817bca09c..8b0461232 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.No-results-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.No-results-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f28caa2bc1a7aef205404d2af3ffb348b389c9eb83169482fcc1350c6120bab
-size 62489
+oid sha256:7406bfb37485f5887656a505a26a9aa68e65230ed851122809cf3e626a63d0c1
+size 39329
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Rooms-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Rooms-iPad-en-GB.png
index 54d4ddaba..38d22fc5f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Rooms-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Rooms-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4aa5c23728897a395066dab65511f747347ed866968d96191377a206c037938
-size 174905
+oid sha256:bff8cb1515228a7dedb057e40c7c9847bab7358050067f47248578d2913b59ff
+size 174780
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Rooms-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Rooms-iPad-pseudo.png
index 142797aa1..5940558c7 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Rooms-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Rooms-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b58acb1090b90d13fa175b3dd8bf4318bdb41b51dcbe26d328d7ab0c57be0f4
-size 177766
+oid sha256:8e20a96e78b00722922232f43f9339d789a5cb8d8680edd6751db162c90d44b0
+size 177030
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Rooms-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Rooms-iPhone-en-GB.png
index dae6bd8de..dd82b3770 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Rooms-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Rooms-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:795306316da27b79588f5e941988c9ec851d59aa23b8c0153ffa5401837dc9ec
-size 123602
+oid sha256:ee445d60715eb830391daeb07185031b7b8594816cc4203526d502664d4f208e
+size 123452
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Rooms-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Rooms-iPhone-pseudo.png
index acfae06c3..d53c0b255 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Rooms-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/searchScreen.Rooms-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1ad0f4d5f683254c0e0cf59f103f462338c77b56616570ef77cd8e334a76243a
-size 126165
+oid sha256:bc18344e26074e971ba431faac5a6192b2f60c5386b316939196553b05117e96
+size 125547