diff --git a/Cargo.lock b/Cargo.lock
index ba6fd353..18306a9d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1723,6 +1723,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-live"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -1731,6 +1732,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-wasm-bridge"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -1738,6 +1740,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-widget"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -1746,6 +1749,7 @@ dependencies = [
 [[package]]
 name = "makepad-draw"
 version = "0.6.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "ab_glyph_rasterizer",
  "fxhash",
@@ -1762,14 +1766,17 @@ dependencies = [
 [[package]]
 name = "makepad-futures"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 
 [[package]]
 name = "makepad-futures-legacy"
 version = "0.7.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 
 [[package]]
 name = "makepad-html"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "makepad-live-id",
 ]
@@ -1777,6 +1784,7 @@ dependencies = [
 [[package]]
 name = "makepad-http"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 
 [[package]]
 name = "makepad-jni-sys"
@@ -1787,6 +1795,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064"
 [[package]]
 name = "makepad-live-compiler"
 version = "0.5.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "makepad-derive-live",
  "makepad-live-tokenizer",
@@ -1796,6 +1805,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "makepad-live-id-macros",
 ]
@@ -1803,6 +1813,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -1810,6 +1821,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-tokenizer"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "makepad-live-id",
  "makepad-math",
@@ -1819,6 +1831,7 @@ dependencies = [
 [[package]]
 name = "makepad-markdown"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "makepad-live-id",
 ]
@@ -1826,14 +1839,17 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-serde-derive",
@@ -1842,6 +1858,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -1849,10 +1866,12 @@ dependencies = [
 [[package]]
 name = "makepad-objc-sys"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 
 [[package]]
 name = "makepad-platform"
 version = "0.6.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "hilog-sys",
  "makepad-android-state",
@@ -1874,6 +1893,7 @@ dependencies = [
 [[package]]
 name = "makepad-rustybuzz"
 version = "0.8.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -1888,6 +1908,7 @@ dependencies = [
 [[package]]
 name = "makepad-shader-compiler"
 version = "0.5.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "makepad-live-compiler",
 ]
@@ -1895,6 +1916,7 @@ dependencies = [
 [[package]]
 name = "makepad-vector"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "resvg",
  "ttf-parser",
@@ -1903,6 +1925,7 @@ dependencies = [
 [[package]]
 name = "makepad-wasm-bridge"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "makepad-derive-wasm-bridge",
  "makepad-live-id",
@@ -1911,6 +1934,7 @@ dependencies = [
 [[package]]
 name = "makepad-widgets"
 version = "0.6.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "makepad-derive-widget",
  "makepad-draw",
@@ -1924,14 +1948,16 @@ dependencies = [
 [[package]]
 name = "makepad-windows"
 version = "0.51.1"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
- "windows-core 0.51.1",
+ "windows-core 0.51.1 (git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content)",
  "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "makepad-zune-core"
 version = "0.2.14"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "bitflags 2.4.1",
 ]
@@ -1939,6 +1965,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-inflate"
 version = "0.2.54"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "simd-adler32",
 ]
@@ -1946,6 +1973,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-jpeg"
 version = "0.3.17"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -1953,6 +1981,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-png"
 version = "0.2.1"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "makepad-zune-core",
  "makepad-zune-inflate",
@@ -3938,6 +3967,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 [[package]]
 name = "ttf-parser"
 version = "0.21.1"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 
 [[package]]
 name = "typenum"
@@ -4334,6 +4364,8 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 [[package]]
 name = "windows-core"
 version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
 dependencies = [
  "windows-targets 0.48.5",
 ]
@@ -4341,8 +4373,7 @@ dependencies = [
 [[package]]
 name = "windows-core"
 version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
  "windows-targets 0.48.5",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 28f991c7..9deb4084 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="
 
 [dependencies]
 # makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "rik" }
-makepad-widgets = { path = "../makepad/widgets" }
+makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "modal_sends_dismissed_action_to_inner_modal_content" }
 
 ## Including this crate automatically configures all `robius-*` crates to work with Makepad.
 robius-use-makepad = "0.1.0"
diff --git a/src/verification.rs b/src/verification.rs
index b39af77d..b71b4fc4 100644
--- a/src/verification.rs
+++ b/src/verification.rs
@@ -170,8 +170,10 @@ async fn sas_verification_handler(
             }
             SasState::Cancelled(cancel_info) => {
                 log!("SAS verification has been cancelled, reason: {}", cancel_info.reason());
-                // No need to send a specific action here, the VerificationRequestState stream loop 
-                // will handle the Cancelled state and send a RequestCancelled action.
+                // We go ahead and send the RequestCancelled action here,
+                // because it is not guaranteed that the VerificationRequestState stream loop 
+                // will receive an update an enter the `Cancelled` state.
+                Cx::post_action(VerificationAction::RequestCancelled(cancel_info));
                 break;
             }
         }
diff --git a/src/verification_modal.rs b/src/verification_modal.rs
index f4f228b3..ca13e35f 100644
--- a/src/verification_modal.rs
+++ b/src/verification_modal.rs
@@ -15,11 +15,11 @@ live_design! {
         width: Fit
         height: Fit
 
-        wrapper = <RoundedView> {
+        <RoundedView> {
             flow: Down
             width: 600
             height: Fit
-            padding: {top: 44, right: 30 bottom: 30 left: 50}
+            padding: {top: 25, right: 30 bottom: 30 left: 45}
             spacing: 10
 
             show_bg: true
@@ -28,43 +28,19 @@ live_design! {
                 radius: 3.0
             }
 
-            <View> {
+            title = <View> {
                 width: Fill,
                 height: Fit,
                 flow: Right
+                padding: {top: 0, bottom: 40}
+                align: {x: 0.5, y: 0.0}
 
-                padding: {top: 8, bottom: 20}
-
-                title = <View> {
-                    width: Fit,
-                    height: Fit,
-
-                    <Label> {
-                        text: "Verification Request"
-                        draw_text: {
-                            text_style: <TITLE_TEXT>{font_size: 13},
-                            color: #000
-                        }
-                    }
-                }
-
-                filler_x = <View> {width: Fill, height: Fit}
-
-                // The "X" close button on the top right corner.
-                close_button = <RobrixIconButton> {
-                    width: Fit,
-                    height: Fit,
-                    align: {x: 1.0, y: 0.0},
-                    margin: 7,
-                    padding: 15,
-
-                    draw_icon: {
-                        svg_file: (ICON_CLOSE),
-                        fn get_color(self) -> vec4 {
-                            return #x0;
-                        }
+                <Label> {
+                    text: "Verification Request"
+                    draw_text: {
+                        text_style: <TITLE_TEXT>{font_size: 13},
+                        color: #000
                     }
-                    icon_walk: {width: 14, height: 14}
                 }
             }
 
@@ -78,7 +54,7 @@ live_design! {
                     width: Fill
                     draw_text: {
                         text_style: <REGULAR_TEXT>{
-                            font_size: 10,
+                            font_size: 11.5,
                             height_factor: 1.3
                         },
                         color: #000
@@ -86,13 +62,14 @@ live_design! {
                     }
                 }
 
-                actions = <View> {
+                <View> {
                     width: Fill, height: Fit
                     flow: Right,
                     align: {x: 1.0, y: 0.5}
                     spacing: 20
 
                     cancel_button = <RobrixIconButton> {
+                        padding: {left: 15, right: 15}
                         draw_icon: {
                             svg_file: (ICON_BLOCK_USER)
                             color: (COLOR_DANGER_RED),
@@ -110,6 +87,7 @@ live_design! {
                     }
 
                     accept_button = <RobrixIconButton> {
+                        padding: {left: 15, right: 15}
                         draw_icon: {
                             svg_file: (ICON_CHECKMARK)
                             color: (COLOR_ACCEPT_GREEN),
@@ -164,25 +142,27 @@ impl WidgetMatchEvent for VerificationModal {
         let accept_button = self.button(id!(accept_button));
         let cancel_button = self.button(id!(cancel_button));
 
-        if cancel_button.clicked(actions)
-            || self.button(id!(close_button)).clicked(actions)
-        {
+        let cancel_button_clicked = cancel_button.clicked(actions);
+        let modal_dismissed = actions
+            .iter()
+            .find(|a| matches!(a.downcast_ref(), Some(ModalAction::Dismissed)))
+            .is_some();
+
+        if cancel_button_clicked || modal_dismissed {
             if let Some(state) = self.state.as_ref() {
                 let _ = state.response_sender.send(VerificationUserResponse::Cancel);
             }
-            cx.widget_action(widget_uid, &scope.path, VerificationModalAction::Close);
             self.reset_state();
-        }
 
-        if actions.iter().find(|a| matches!(a.downcast_ref(), Some(ModalAction::Dismissed))).is_some() {
-            // The modal was dismissed by clicking outside of it, so we do NOT need
-            // to emit a `VerificationModalAction::Close` action, as that would cause
+            // If the modal was dismissed by clicking outside of it, we MUST NOT emit
+            // a `VerificationModalAction::Close` action, as that would cause
             // an infinite action feedback loop.
-            self.reset_state();
+            if !modal_dismissed {
+                cx.widget_action(widget_uid, &scope.path, VerificationModalAction::Close);
+            }
         }
 
-
-        if self.button(id!(accept_button)).clicked(actions) {
+        if accept_button.clicked(actions) {
             if self.is_final {
                 cx.widget_action(widget_uid, &scope.path, VerificationModalAction::Close);
                 self.reset_state();
@@ -273,13 +253,22 @@ impl WidgetMatchEvent for VerificationModal {
                     }
 
                     VerificationAction::KeysExchanged { emojis, decimals } => {
-                        self.label(id!(prompt)).set_text(&format!(
-                            "Keys have been exchanged. Please verify the following:\n\n\
-                            - Emojis: {:?}\n\
-                            - Decimals: {:?}\n\n\
-                            Do these keys match?",
-                            emojis, decimals
-                        ));
+                        let text = if let Some(emoji_list) = emojis {
+                            format!(
+                                "Keys have been exchanged. Please verify the following emoji:\
+                                \n   {}\n\n\
+                                Do these emoji keys match?",
+                                emoji_list.emojis.iter().map(|em| em.description).collect::<Vec<_>>().join("\n   ")
+                            )
+                        } else {
+                            format!(
+                                "Keys have been exchanged. Please verify the following numbers:\n\
+                                \n   {}\n   {}\n   {}\n\n\
+                                Do these number keys match?",
+                                decimals.0, decimals.1, decimals.2,
+                            )
+                        };
+                        self.label(id!(prompt)).set_text(&text);;
                         accept_button.set_enabled(true);
                         accept_button.set_text("Yes");
                         cancel_button.set_text("No");
@@ -289,7 +278,7 @@ impl WidgetMatchEvent for VerificationModal {
 
                     VerificationAction::SasConfirmed => {
                         self.label(id!(prompt)).set_text(
-                            "You successfully confirmed the Short Auth Strings.\n\n\
+                            "You successfully confirmed the Short Auth String keys.\n\n\
                             Waiting for the other device to confirm..."
                         );
                         accept_button.set_enabled(false);
@@ -301,7 +290,7 @@ impl WidgetMatchEvent for VerificationModal {
 
                     VerificationAction::SasConfirmationError(error) => {
                         self.label(id!(prompt)).set_text(
-                            &format!("Error confirming keys: {}\n\nPlease try the verification process again.", error)
+                            &format!("Error confirming keys: {}\n\nPlease retry the verification process.", error)
                         );
                         accept_button.set_text("Ok");
                         accept_button.set_enabled(true);