diff --git a/ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/SessionVerificationScreenViewModel.swift b/ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/SessionVerificationScreenViewModel.swift
index b23e577ab8..2b2ab53290 100644
--- a/ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/SessionVerificationScreenViewModel.swift
+++ b/ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/SessionVerificationScreenViewModel.swift
@@ -123,7 +123,15 @@ class SessionVerificationScreenViewModel: SessionVerificationViewModelType, Sess
             case (.initial, .acceptVerificationRequest, .acceptingVerificationRequest):
                 acceptVerificationRequest()
             case (.initial, .requestVerification, .requestingVerification):
-                requestVerification()
+                Task {
+                    switch await self.requestVerification() {
+                    case .success:
+                        // Need to wait for the callback from the remote
+                        break
+                    case .failure:
+                        self.stateMachine.processEvent(.didFail)
+                    }
+                }
             case (.verificationRequestAccepted, .startSasVerification, .startingSasVerification):
                 startSasVerification()
             case (.showingChallenge, .acceptChallenge, .acceptingChallenge):
@@ -166,28 +174,14 @@ class SessionVerificationScreenViewModel: SessionVerificationViewModelType, Sess
         }
     }
     
-    private func requestVerification() {
-        Task {
-            switch flow {
-            case .deviceInitiator:
-                switch await sessionVerificationControllerProxy.requestDeviceVerification() {
-                case .success:
-                    // Need to wait for the callback from the remote
-                    break
-                case .failure:
-                    stateMachine.processEvent(.didFail)
-                }
-            case .userIntiator(let userID):
-                switch await sessionVerificationControllerProxy.requestUserVerification(userID) {
-                case .success:
-                    // Need to wait for the callback from the remote
-                    break
-                case .failure:
-                    stateMachine.processEvent(.didFail)
-                }
-            default:
-                fatalError("Incorrect API usage.")
-            }
+    private func requestVerification() async -> Result<Void, SessionVerificationControllerProxyError> {
+        switch flow {
+        case .deviceInitiator:
+            return await sessionVerificationControllerProxy.requestDeviceVerification()
+        case .userIntiator(let userID):
+            return await sessionVerificationControllerProxy.requestUserVerification(userID)
+        default:
+            fatalError("Incorrect API usage.")
         }
     }
     
diff --git a/ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/View/SessionVerificationRequestDetailsView.swift b/ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/View/SessionVerificationRequestDetailsView.swift
index 95b5593477..b0ae6d953e 100644
--- a/ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/View/SessionVerificationRequestDetailsView.swift
+++ b/ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/View/SessionVerificationRequestDetailsView.swift
@@ -98,7 +98,9 @@ struct SessionVerificationRequestDetailsView: View {
             }
             
             .font(.compound.bodyMDSemibold)
+            
             Text(L10n.screenSessionVerificationRequestFooter)
+                .font(.compound.bodyMDSemibold)
                 .foregroundColor(.compound.textPrimary)
         }
     }
diff --git a/ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/View/SessionVerificationScreen.swift b/ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/View/SessionVerificationScreen.swift
index 1bb79d9ae9..1de1f66a52 100644
--- a/ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/View/SessionVerificationScreen.swift
+++ b/ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/View/SessionVerificationScreen.swift
@@ -31,7 +31,7 @@ struct SessionVerificationScreen: View {
     // MARK: - Private
     
     private var toolbar: some ToolbarContent {
-        ToolbarItem(placement: .navigationBarLeading) {
+        ToolbarItem(placement: .cancellationAction) {
             switch context.viewState.flow {
             case .userIntiator, .userResponder:
                 Button(L10n.actionCancel) {
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-en-GB.Initial-Device-Responder.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-en-GB.Initial-Device-Responder.png
index 650ee0e8df..cc8608a2a0 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-en-GB.Initial-Device-Responder.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-en-GB.Initial-Device-Responder.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a7d0e25aa5161126d696db913da661d6fd75b0397dfa7ebb6c473f3399dd1dc
-size 125107
+oid sha256:544b7532106675cab7af24c26b8e4fec538f3db9d954dbb01d43c165e9404f94
+size 124983
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-pseudo.Initial-Device-Responder.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-pseudo.Initial-Device-Responder.png
index bd009ad439..2ff0104a65 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-pseudo.Initial-Device-Responder.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPad-pseudo.Initial-Device-Responder.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b68bb87a002bd4de26a23f2f1523f66f29e7cc589302b01268786d2deed96fb3
-size 144922
+oid sha256:9ba093b11028e7ff672fc7fdfa3d0df629fa463893e2e7191e6a022100b5fff8
+size 146508
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPhone-16-en-GB.Initial-Device-Responder.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPhone-16-en-GB.Initial-Device-Responder.png
index 4784c8ce3e..ed2d0104c0 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPhone-16-en-GB.Initial-Device-Responder.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPhone-16-en-GB.Initial-Device-Responder.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac425720600b341ca9e7d80cdba315e64ff1464fa0be859193acbe7804998580
-size 77159
+oid sha256:80978072d73aeb5da1e0770e43c90d4b520e9033869a0bdef0e7d2f18726cf5b
+size 76338
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPhone-16-pseudo.Initial-Device-Responder.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPhone-16-pseudo.Initial-Device-Responder.png
index 933840bac2..2fa7e07cb9 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPhone-16-pseudo.Initial-Device-Responder.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerification-iPhone-16-pseudo.Initial-Device-Responder.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:99a35cbd2a6d030b3b562d169bf65bb47df942efce378da16d9c6b7e6b7bb708
-size 102767
+oid sha256:74f3e11279a27cae1ee631f1ecd9a1caad06413afbc96ca5449250c37b9c0b8e
+size 101758
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerificationRequestDetailsView-iPad-en-GB.Device.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerificationRequestDetailsView-iPad-en-GB.Device.png
index 5289287853..2ef80aa150 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerificationRequestDetailsView-iPad-en-GB.Device.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerificationRequestDetailsView-iPad-en-GB.Device.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:857ebc197e688957b8850aecf3b637b4ca9ce36d367b4f3559652dc58d65737c
-size 94542
+oid sha256:8ff548761c5ae8e6987657ea24fb9b60d60ee586c361e0a855613302ebaac2ea
+size 94375
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerificationRequestDetailsView-iPad-pseudo.Device.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerificationRequestDetailsView-iPad-pseudo.Device.png
index 962d332360..072cc4c513 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerificationRequestDetailsView-iPad-pseudo.Device.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerificationRequestDetailsView-iPad-pseudo.Device.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2cdc7fe38d2fb46b8db0893253f70472323c2f12e379ce2f89a4fc3ca2281f7
-size 100328
+oid sha256:1fc4a362554236648306b49ea1127b60acafb5905814d1099768dbf016099d88
+size 103033
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerificationRequestDetailsView-iPhone-16-en-GB.Device.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerificationRequestDetailsView-iPhone-16-en-GB.Device.png
index 3a0df24f9d..7001cdf7ee 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerificationRequestDetailsView-iPhone-16-en-GB.Device.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerificationRequestDetailsView-iPhone-16-en-GB.Device.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f27f742f48bb56627a03b791e49934aa5f1d80f572aaa744bc8a93e78ed4ffff
-size 52053
+oid sha256:ff063c2dab712e1a94c0ce21c7d76086bb61d3526284c7e6434017080beb530c
+size 51303
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerificationRequestDetailsView-iPhone-16-pseudo.Device.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerificationRequestDetailsView-iPhone-16-pseudo.Device.png
index b7633c946c..d28e79cab5 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerificationRequestDetailsView-iPhone-16-pseudo.Device.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_sessionVerificationRequestDetailsView-iPhone-16-pseudo.Device.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46cce7e87646fd73644f1e70506d39f115a08967add62c251b3ced2a5f544f68
-size 61760
+oid sha256:28b4a4b5d44dd63ca00fd561b9cc2955eb4ebff3df39b13810a22e792b05cd7c
+size 60750