diff --git a/ElementX/Sources/Other/SwiftUI/Views/JoinCallButton.swift b/ElementX/Sources/Other/SwiftUI/Views/JoinCallButton.swift
index e17f192dc..819838852 100644
--- a/ElementX/Sources/Other/SwiftUI/Views/JoinCallButton.swift
+++ b/ElementX/Sources/Other/SwiftUI/Views/JoinCallButton.swift
@@ -22,12 +22,19 @@ struct JoinCallButton: View {
     
     var glassButton: some View {
         Button(action: action) {
-            Text(L10n.a11yJoinCall)
-                .font(.compound.bodyLG.weight(.medium))
-                .foregroundStyle(.compound.textOnSolidPrimary)
+            // Use an HStack on iOS 26 as .labelStyle(.titleAndIcon) doesn't
+            // seem to have any effect on a label in the navigation bar 🤷‍♂️
+            HStack(spacing: 6) {
+                CompoundIcon(\.videoCallSolid)
+                Text(L10n.actionJoin)
+                    .padding(.trailing, 4)
+            }
+            .font(.compound.bodyLG.weight(.medium))
+            .foregroundStyle(.compound.textOnSolidPrimary)
         }
-        .tint(.compound.bgAccentRest)
+        .tint(.compound.bgActionPrimaryRest)
         .backportButtonStyleGlassProminent()
+        .accessibilityLabel(L10n.a11yJoinCall)
     }
     
     var customButton: some View {
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-en-GB.png
index ec0480f70..fcc5e5d46 100644
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-en-GB.png
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:caa03f5a0f9650ef511bb7da58ceb0c9666524134055444493e9b5edfc18bd6f
-size 319182
+oid sha256:171da6b4a43eaacb7e3591ea7913bf1ae654bd766413fddc4035a2eb1bc52850
+size 319591
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPhone-en-GB.png
index 6e717b7ed..74aaf0185 100644
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPhone-en-GB.png
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7086508bbd5c8f070a8620bbec178ffa42c13bfefac085362e88acb3a399f375
-size 137009
+oid sha256:5ee5a5956288404264146f8b5c40a42b0fd0b1b4b9c8f1efefdc2ac7b1477807
+size 137039
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPhone-en-GB.png
index 0b00055dd..b81832dfa 100644
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPhone-en-GB.png
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d04577dd18d325fbff90a3d91a766346d7f297b53760f4be63cb087fc8968f2
-size 168990
+oid sha256:a66088f2da878347735a7f401688e9ff3eb7fc0969aa640a5102da1c41f6d8a3
+size 168441
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPhone-en-GB.png
index b752c40f9..0b81037d7 100644
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPhone-en-GB.png
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee3d0dcf7c7b532a2f18c2ea7e5c76067b1e2830264ed1c91de46d4e94c40a53
-size 290791
+oid sha256:a971dc8b3d02bfce3738e15769221bc341f9ffa375fd20a57228c7ed42abbfef
+size 289917
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPhone-en-GB.png
index 1904ea380..19d719406 100644
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPhone-en-GB.png
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22493f6ddeb50f46564f325fab17740d333d1e0055b4b5e690204b6dbb62dab0
-size 240271
+oid sha256:3c308accaa3b132d4a69c47dbb188eb52b9d9700b47e4639e0fc0bf0f0875989
+size 240083
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-en-GB-0.png
index 6b71d01a2..002d61080 100644
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-en-GB-0.png
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a27ba43c793816b3922cb2f003303c2aa54d99ed6b5a31882bc25d2eb3f9adf1
-size 281398
+oid sha256:aab78460a9019b74dab1f5cfd790ab766d7ef90b40acd227c9a0826ec7d5626d
+size 281544
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-en-GB-1.png
index ba8379cd6..5a48adeab 100644
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-en-GB-1.png
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-en-GB-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:72843951c33223442a000d861844a33e915e481389b043455e30833ad3523d7f
-size 259234
+oid sha256:f68f6372172a8fe470121cb4a48879d42d88f68fa59f672a91b869f0f669dd21
+size 256648
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPhone-en-GB.png
index 2bd5c51ba..350291a41 100644
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPhone-en-GB.png
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:67867297fc19bdf2bd72f9a97af465970e23dd46e836a6a4ba0a10d076e44d04
-size 305013
+oid sha256:85105a0a6a59ee90590730838145dbe05125f6f33f4dc590632776da8ac2342e
+size 305171
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPhone-en-GB.png
index b1e94bdb3..b90279ba4 100644
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPhone-en-GB.png
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73c733c998c73c28ad723ad56f412c085806b8448fd5048e9309c12694efc1d9
-size 269350
+oid sha256:d315cc9c237edbb98202de32785801cffad32e6c1dd020adec9e39384842ab45
+size 268709
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPhone-en-GB.png
index 34ab6aff0..84f36caac 100644
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPhone-en-GB.png
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b38b39d37229013d8787d2b50591a4356c0d61a42384b6b9c8cfe307225e9913
-size 183389
+oid sha256:de3d01e04bd86763b1f75cf02ed11b9615b3617a22d530c0cbbbd2c1308938a1
+size 182404
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPhone-en-GB.png
index 0dec6753b..9fd27bdb6 100644
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPhone-en-GB.png
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f07c729d345b6f580bff7e88df4320e6d35b2cfd56623bfeaad5c2b1470e3a9
-size 167050
+oid sha256:3591eee911fd416b8328ec696ba2287752ec08881c6ddb0e58e4d7bd79cd54b8
+size 167215
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPhone-en-GB.png
index f0e1513e2..d446b7e02 100644
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPhone-en-GB.png
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:edbf75d4de036f9d60cb687a8c7fa4d1bb81f55c8f37b577dec51b761191d653
-size 234564
+oid sha256:452a2bcaa06f8e61d0921eaa6cdcf9a0f469758bb57c7730206513505aadc129
+size 234406
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPhone-en-GB-8.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPhone-en-GB-8.png
index 6fd123e4d..f2dadc0c8 100644
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPhone-en-GB-8.png
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testSpaceExploration-iPhone-en-GB-8.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7ebc5357f3bc230345f249a64c5ddbdcd48574fd9fa6b7d7db11dca968fa086
-size 287151
+oid sha256:e51110cb27d519202e7026898fff97197b88c7936ccb210d20b33e61074918fb
+size 286820
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-en-GB-2.png
index 6a4642f76..822d4a94d 100644
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-en-GB-2.png
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-en-GB-2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:746691db124306e8507dd48e42c54c0ecce8d546edee9b549932c554a78426aa
-size 298397
+oid sha256:9e98280ce587f8f1a85e503bd4b4a2aacebfecd0e6591f5d719c3ed7097a6bce
+size 299766
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-en-GB-3.png
index 1ee7c8018..d978bc222 100644
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-en-GB-3.png
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-en-GB-3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:844ecd50cad5317ea4dddc51881a6428f3be74352240492ffba027b1f5d9e6f1
-size 442531
+oid sha256:a2bd268f7474dd09384a646e24f74a1f529f30d4717df5260208b2f4f1a07ea3
+size 443867
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-en-GB.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-en-GB.png
index 3f143a721..8214a6311 100644
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-en-GB.png
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab174bad5c17e09709d476f2585b6a53b2b4d66f51c4708d8acfa1784fd2c49a
-size 271704
+oid sha256:c41560089930954c50895d3b8fcbfe8ff2beb037c1ac87fa51ffea79aa2982c7
+size 272629