diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenEmptyStateView.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenEmptyStateView.swift
index 6ed0d020f..78671b5a9 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenEmptyStateView.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenEmptyStateView.swift
@@ -15,7 +15,7 @@ struct HomeScreenEmptyStateView: View {
     let context: HomeScreenViewModel.Context
     
     var body: some View {
-        VStack(spacing: 6) {
+        VStack(spacing: 2) {
             Text(L10n.screenRoomlistEmptyTitle)
                 .font(.compound.bodyLG)
                 .foregroundColor(.compound.textSecondary)
@@ -25,14 +25,14 @@ struct HomeScreenEmptyStateView: View {
                 .font(.compound.bodyLG)
                 .foregroundColor(.compound.textSecondary)
                 .multilineTextAlignment(.center)
-                .padding(.bottom, 12)
+                .padding(.bottom, 16)
             
             Button { context.send(viewAction: .startChat) } label: {
-                Label(L10n.actionStartChat, icon: \.compose)
+                Label(L10n.actionStartChat, icon: \.chat)
                     .font(.compound.bodyLGSemibold)
                     .foregroundColor(.compound.textOnSolidPrimary)
                     .padding(.vertical, 6)
-                    .padding(.horizontal, 22)
+                    .padding(.horizontal, 8)
             }
             .buttonStyle(.borderedProminent)
             .buttonBorderShape(.capsule)
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPad-en-GB.png
index 015e02660..bdd91dcf3 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5c3f0e901ac5ed774635e2d481dcf7f8cc21d44bb1223958a5eea10338412f4f
-size 109681
+oid sha256:c4f4db3f141e2426795a363433c85fbfa21a1f2f00608297cc4ce16199f6ff85
+size 109993
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPad-pseudo.png
index 4f9f7004f..6ff7f93f5 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d200a4a00a5b36ee4660b6a45ebf7ae3ce85e6a7b68fe7a581e8146757617b88
-size 113888
+oid sha256:0f3bb69ea3ef922d0a4ff58e7e3f536c7a15bec1560c80de47ae64e42d348ad1
+size 114159
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPhone-en-GB.png
index 98628e843..1bb109cea 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4541c3f1c6a23cec42e7583425bb77f98497281609afedac2d5720e1ed5915e
-size 58566
+oid sha256:e4b2406452f7aec759b64371b94db5d14882a76b38400c9507bbc14145a50d63
+size 59185
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPhone-pseudo.png
index aadffebb2..932c02f47 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Empty-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:caf0391c35cb49222cc20cf31375637394da5e25ac9cc487c2bb626ae5a15a65
-size 68680
+oid sha256:f85ab6fde5d77698f2cc660d671500ed1b2b4d4868f06bbe81b68881159ab4c5
+size 68991
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Constrained-layout-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Constrained-layout-iPad-en-GB.png
index ec617b057..6c354b13c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Constrained-layout-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Constrained-layout-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c19c4095724179a291e93c2b380ed3f101d7a3f5673a35db4ce22223b7c85a93
-size 132112
+oid sha256:a820188dcad93df6b059e9f53bf98e778bb91a9a9a591e46e314e3298a4f5393
+size 132601
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Constrained-layout-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Constrained-layout-iPad-pseudo.png
index 708e846cb..f6329e6e8 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Constrained-layout-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Constrained-layout-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1632020231368917f9a90cf0c17a4355e7d52332fe37370a524fd31465f59caa
-size 147990
+oid sha256:47679ee144633ca17a90e4119487c331b8d85827e6c2ffbdbf330a64483a31e7
+size 148395
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Constrained-layout-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Constrained-layout-iPhone-en-GB.png
index d03bc39b7..39b9b7cb8 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Constrained-layout-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Constrained-layout-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a656054268971712367988d9a7403c6f2207ea09785be8047b85b721f1693c1f
-size 89170
+oid sha256:adbd1bf04c03f28ce480f6bad038819ae8dfb4c4761d3a6badcc4bc480bffe67
+size 89629
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Constrained-layout-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Constrained-layout-iPhone-pseudo.png
index d1c6cdeda..15a631a82 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Constrained-layout-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Constrained-layout-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad622b2c5f66d27773e1096945d7b9b2c30892810fdd157e9211c2de6ef652e0
-size 132059
+oid sha256:28690f207a7a196b0405197bd871adc2a5296d418beccb18c611e51a46e6cfca
+size 132314
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Normal-Layout-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Normal-Layout-iPad-en-GB.png
index debb965c8..a80d06b6f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Normal-Layout-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Normal-Layout-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7e1af9e3e4b5ac96faa39a967215c789c8bdedf7ccecc7615f0b6fbfa2ca103
-size 100611
+oid sha256:32da73f7c5bb8c0f0b30f17ddaa80e88ce39f678f79de4a465aad30191b910ef
+size 100851
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Normal-Layout-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Normal-Layout-iPad-pseudo.png
index a0d3e858d..ff0f3e4c2 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Normal-Layout-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Normal-Layout-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e348f7d0bb97f004e02d250b7f1ce21dddce0fa8fd712075cb086221623b751a
-size 107883
+oid sha256:54ab7776a428575f1fbf9d4c5e1076b8067863cfa9f74ef929a664539313c79b
+size 108129
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Normal-Layout-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Normal-Layout-iPhone-en-GB.png
index d955ec983..1a62c25ee 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Normal-Layout-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Normal-Layout-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f38201847454c14e420bac5a44d2dc95b79306858d1773b53060a0684351152
-size 59906
+oid sha256:beff8f3e3c7248bf0409990200cf580afa28d3b03fc368134e6a8d102e8c604e
+size 60560
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Normal-Layout-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Normal-Layout-iPhone-pseudo.png
index cfbe094e0..de5368f57 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Normal-Layout-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.Normal-Layout-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:828cb02333452c0ef168defcec49721b36155c511ee29e6e3162f843bad71fe7
-size 83601
+oid sha256:0eb03d8ec2d89fecfd3ae01118c9e640692834a3473efb91e0086c2167079b94
+size 83689
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.View-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.View-iPad-en-GB.png
index ce23976ac..04d4f3279 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.View-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.View-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d42d7cc3d7b05bccb8ad8feca2998f3f79d6553c2877f49b9159f3541c07b210
-size 84291
+oid sha256:969a40cd3f190bce35635207576176cf17b4acdd1fc4b9272963e703fda9add4
+size 84572
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.View-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.View-iPad-pseudo.png
index 3f5e164d0..15ee4ee38 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.View-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.View-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbe8e164ecdd90b8d5edf3e00ec99a9d6a46a63fec7d29afbf570a6df14c7993
-size 87816
+oid sha256:88c3a865c3c87065eabac182cef88d07dbe139520559083b133942d200e11994
+size 88084
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.View-iPhone-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.View-iPhone-en-GB.png
index e43182fcc..b9f181728 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.View-iPhone-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.View-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d54ecf7fefbc7e525b1d91369ea14d4cde097cbf8676afba9dc1a5fbc822233
-size 44012
+oid sha256:917d71b124d77c3e692a44a450a1ce96b3809311c171fb7e72850b99b3e105e8
+size 44694
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.View-iPhone-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.View-iPhone-pseudo.png
index f13007ba4..d507fb0b6 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.View-iPhone-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenEmptyStateView.View-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6fd646c91fbb81cd64c6c00e7bbd23e766f3b49682c5be645522701d53995950
-size 54330
+oid sha256:19b3d74ac5432b37f8360369e89af4bccb0656e18b879817b6a8a12ee48d0cfb
+size 54390