diff --git a/Cargo.lock b/Cargo.lock
index 0c14b41cd..1c121437b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ version = 4
 [[package]]
 name = "ab_glyph_rasterizer"
 version = "0.1.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "accessory"
@@ -227,7 +227,7 @@ dependencies = [
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "as_variant"
@@ -238,7 +238,7 @@ checksum = "9dbc3a507a82b17ba0d98f6ce8fd6954ea0c8152e98009d36a40d8dcc8ce078a"
 [[package]]
 name = "ash"
 version = "0.38.0+1.3.281"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "libloading 0.8.9",
 ]
@@ -584,7 +584,7 @@ dependencies = [
 [[package]]
 name = "bit-set"
 version = "0.8.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "bit-vec",
 ]
@@ -592,7 +592,7 @@ dependencies = [
 [[package]]
 name = "bit-vec"
 version = "0.8.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "bitflags"
@@ -606,7 +606,7 @@ dependencies = [
 [[package]]
 name = "bitflags"
 version = "2.10.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "bitmaps"
@@ -724,7 +724,7 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 [[package]]
 name = "bytemuck"
 version = "1.25.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "byteorder"
@@ -735,7 +735,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 [[package]]
 name = "byteorder"
 version = "1.5.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "bytes"
@@ -794,7 +794,7 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "cfg_aliases"
@@ -805,7 +805,7 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 [[package]]
 name = "cfg_aliases"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "chacha20"
@@ -1142,7 +1142,7 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 [[package]]
 name = "crunchy"
 version = "0.2.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "crypto-bigint"
@@ -1522,7 +1522,7 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 [[package]]
 name = "downcast-rs"
 version = "1.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "dunce"
@@ -1630,7 +1630,7 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 [[package]]
 name = "equivalent"
 version = "1.0.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "errno"
@@ -1808,7 +1808,7 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 [[package]]
 name = "foldhash"
 version = "0.2.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "foreign-types"
@@ -1965,9 +1965,9 @@ dependencies = [
 [[package]]
 name = "fxhash"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
- "byteorder 1.5.0 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "byteorder 1.5.0 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
 ]
 
 [[package]]
@@ -2163,9 +2163,9 @@ dependencies = [
 [[package]]
 name = "hashbrown"
 version = "0.16.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
- "foldhash 0.2.0 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "foldhash 0.2.0 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
 ]
 
 [[package]]
@@ -2198,7 +2198,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 [[package]]
 name = "hexf-parse"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "hilog-sys"
@@ -2637,10 +2637,10 @@ dependencies = [
 [[package]]
 name = "indexmap"
 version = "2.13.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
- "equivalent 1.0.2 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
- "hashbrown 0.16.1 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "equivalent 1.0.2 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
+ "hashbrown 0.16.1 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
 ]
 
 [[package]]
@@ -2832,9 +2832,9 @@ dependencies = [
 [[package]]
 name = "libloading"
 version = "0.8.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
- "cfg-if 1.0.4 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "cfg-if 1.0.4 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
  "windows-link 0.2.1",
 ]
 
@@ -2906,7 +2906,7 @@ checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 [[package]]
 name = "log"
 version = "0.4.29"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "loom"
@@ -2987,7 +2987,7 @@ dependencies = [
 [[package]]
 name = "makepad-apple-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-objc-sys",
 ]
@@ -2995,12 +2995,12 @@ dependencies = [
 [[package]]
 name = "makepad-byteorder-lite"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "makepad-code-editor"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-widgets",
 ]
@@ -3008,7 +3008,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3016,7 +3016,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-widget"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -3025,7 +3025,7 @@ dependencies = [
 [[package]]
 name = "makepad-draw"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "ab_glyph_rasterizer",
  "fxhash",
@@ -3042,15 +3042,15 @@ dependencies = [
  "rustybuzz",
  "sdfer",
  "serde",
- "unicode-bidi 0.3.18 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "unicode-bidi 0.3.18 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
  "unicode-linebreak",
- "unicode-segmentation 1.12.0 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "unicode-segmentation 1.12.0 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
 ]
 
 [[package]]
 name = "makepad-error-log"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3058,22 +3058,22 @@ dependencies = [
 [[package]]
 name = "makepad-filesystem-watcher"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "makepad-futures"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "makepad-futures-legacy"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "makepad-gif"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "weezl",
 ]
@@ -3081,10 +3081,10 @@ dependencies = [
 [[package]]
 name = "makepad-half"
 version = "2.7.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
- "cfg-if 1.0.4 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
- "crunchy 0.2.4 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "cfg-if 1.0.4 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
+ "crunchy 0.2.4 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
  "num-traits 0.2.20",
  "zerocopy 0.8.39",
 ]
@@ -3092,7 +3092,7 @@ dependencies = [
 [[package]]
 name = "makepad-html"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-live-id",
 ]
@@ -3106,7 +3106,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064"
 [[package]]
 name = "makepad-latex-math"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "ttf-parser",
 ]
@@ -3114,7 +3114,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-live-id-macros",
  "serde",
@@ -3123,7 +3123,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3131,7 +3131,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-reload-core"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-filesystem-watcher",
 ]
@@ -3139,7 +3139,7 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3147,12 +3147,12 @@ dependencies = [
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-serde-derive",
@@ -3161,7 +3161,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3169,7 +3169,7 @@ dependencies = [
 [[package]]
 name = "makepad-network"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-apple-sys",
  "makepad-error-log",
@@ -3183,15 +3183,15 @@ dependencies = [
 [[package]]
 name = "makepad-objc-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "makepad-platform"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "ash",
- "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
  "ctrlc",
  "hilog-sys",
  "makepad-android-state",
@@ -3213,7 +3213,7 @@ dependencies = [
  "napi-derive-ohos",
  "napi-ohos",
  "ohos-sys",
- "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
  "wayland-client",
  "wayland-egl",
  "wayland-protocols",
@@ -3225,12 +3225,12 @@ dependencies = [
 [[package]]
 name = "makepad-regex"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "makepad-script"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-error-log",
  "makepad-html",
@@ -3238,13 +3238,13 @@ dependencies = [
  "makepad-math",
  "makepad-regex",
  "makepad-script-derive",
- "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
 ]
 
 [[package]]
 name = "makepad-script-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3252,7 +3252,7 @@ dependencies = [
 [[package]]
 name = "makepad-script-std"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-network",
  "makepad-script",
@@ -3261,14 +3261,14 @@ dependencies = [
 [[package]]
 name = "makepad-shared-bytes"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "makepad-studio-protocol"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
- "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
  "makepad-error-log",
  "makepad-live-id",
  "makepad-micro-serde",
@@ -3278,7 +3278,7 @@ dependencies = [
 [[package]]
 name = "makepad-svg"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-html",
  "makepad-live-id",
@@ -3287,7 +3287,7 @@ dependencies = [
 [[package]]
 name = "makepad-tsdf"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-math",
  "makepad-micro-serde",
@@ -3296,7 +3296,7 @@ dependencies = [
 [[package]]
 name = "makepad-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-derive-wasm-bridge",
  "makepad-live-id",
@@ -3305,7 +3305,7 @@ dependencies = [
 [[package]]
 name = "makepad-webp"
 version = "0.2.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-byteorder-lite",
 ]
@@ -3313,7 +3313,7 @@ dependencies = [
 [[package]]
 name = "makepad-widgets"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-derive-widget",
  "makepad-draw",
@@ -3322,13 +3322,13 @@ dependencies = [
  "pulldown-cmark 0.12.2",
  "serde",
  "ttf-parser",
- "unicode-segmentation 1.12.0 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "unicode-segmentation 1.12.0 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
 ]
 
 [[package]]
 name = "makepad-zune-bmp"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "log 0.4.28",
  "makepad-zune-core",
@@ -3337,7 +3337,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-core"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "log 0.4.28",
 ]
@@ -3345,7 +3345,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-inflate"
 version = "0.2.54"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "simd-adler32",
 ]
@@ -3353,7 +3353,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-jpeg"
 version = "0.5.15"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3361,7 +3361,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-png"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-zune-core",
  "makepad-zune-inflate",
@@ -3370,7 +3370,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-qoi"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3752,7 +3752,7 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 [[package]]
 name = "memchr"
 version = "2.7.6"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "mime"
@@ -3815,23 +3815,23 @@ dependencies = [
 [[package]]
 name = "naga"
 version = "27.0.3"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
- "arrayvec 0.7.6 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "arrayvec 0.7.6 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
  "bit-set",
  "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 1.0.4 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
- "cfg_aliases 0.2.1 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
- "hashbrown 0.16.1 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "cfg-if 1.0.4 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
+ "cfg_aliases 0.2.1 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
+ "hashbrown 0.16.1 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
  "hexf-parse",
- "indexmap 2.13.0 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "indexmap 2.13.0 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
  "makepad-error-log",
  "makepad-half",
  "num-traits 0.2.20",
- "once_cell 1.21.3 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "once_cell 1.21.3 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
  "rustc-hash 1.1.0",
  "spirv",
- "thiserror 2.0.18 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "thiserror 2.0.18 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
  "unicode-ident",
 ]
 
@@ -3999,7 +3999,7 @@ dependencies = [
 [[package]]
 name = "num-traits"
 version = "0.2.20"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "num_cpus"
@@ -4163,7 +4163,7 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 [[package]]
 name = "once_cell"
 version = "1.21.3"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "once_cell_polyfill"
@@ -4452,7 +4452,7 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 [[package]]
 name = "pkg-config"
 version = "0.3.32"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "pollster"
@@ -4597,10 +4597,10 @@ dependencies = [
 [[package]]
 name = "pulldown-cmark"
 version = "0.12.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
- "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
- "memchr 2.7.6 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
+ "memchr 2.7.6 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
  "unicase 2.9.0",
 ]
 
@@ -5381,7 +5381,7 @@ dependencies = [
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "rustc-hash"
@@ -5506,12 +5506,12 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 [[package]]
 name = "rustybuzz"
 version = "0.18.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
- "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
  "bytemuck",
  "makepad-error-log",
- "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
  "ttf-parser",
  "unicode-bidi-mirroring",
  "unicode-ccc",
@@ -5600,7 +5600,7 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "scopeguard"
@@ -5611,7 +5611,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "sdfer"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "sealed"
@@ -5910,7 +5910,7 @@ dependencies = [
 [[package]]
 name = "simd-adler32"
 version = "0.3.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "siphasher"
@@ -5936,7 +5936,7 @@ dependencies = [
 [[package]]
 name = "smallvec"
 version = "1.15.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "socket2"
@@ -5960,7 +5960,7 @@ dependencies = [
 [[package]]
 name = "spirv"
 version = "0.3.0+sdk-1.3.268.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -6320,9 +6320,9 @@ dependencies = [
 [[package]]
 name = "thiserror"
 version = "2.0.18"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
- "thiserror-impl 2.0.18 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "thiserror-impl 2.0.18 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
 ]
 
 [[package]]
@@ -6350,7 +6350,7 @@ dependencies = [
 [[package]]
 name = "thiserror-impl"
 version = "2.0.18"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -6732,7 +6732,7 @@ dependencies = [
 [[package]]
 name = "ttf-parser"
 version = "0.24.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "tungstenite"
@@ -6784,7 +6784,7 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 [[package]]
 name = "unicase"
 version = "2.9.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "unicode-bidi"
@@ -6795,17 +6795,17 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 [[package]]
 name = "unicode-bidi"
 version = "0.3.18"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "unicode-bidi-mirroring"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "unicode-ccc"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "unicode-ident"
@@ -6816,7 +6816,7 @@ checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 [[package]]
 name = "unicode-linebreak"
 version = "0.1.5"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "unicode-normalization"
@@ -6836,12 +6836,12 @@ checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 [[package]]
 name = "unicode-properties"
 version = "0.1.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "unicode-script"
 version = "0.5.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "unicode-segmentation"
@@ -6852,7 +6852,7 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 [[package]]
 name = "unicode-segmentation"
 version = "1.12.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "unicode-xid"
@@ -7178,11 +7178,11 @@ dependencies = [
 [[package]]
 name = "wayland-backend"
 version = "0.3.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "downcast-rs",
  "libc",
- "scoped-tls 1.0.1 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "scoped-tls 1.0.1 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
  "smallvec 1.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-sys",
 ]
@@ -7190,7 +7190,7 @@ dependencies = [
 [[package]]
 name = "wayland-client"
 version = "0.31.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc",
@@ -7200,7 +7200,7 @@ dependencies = [
 [[package]]
 name = "wayland-egl"
 version = "0.32.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "wayland-backend",
  "wayland-sys",
@@ -7209,7 +7209,7 @@ dependencies = [
 [[package]]
 name = "wayland-protocols"
 version = "0.32.10"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-backend",
@@ -7219,10 +7219,10 @@ dependencies = [
 [[package]]
 name = "wayland-sys"
 version = "0.31.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "log 0.4.29",
- "pkg-config 0.3.32 (git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound)",
+ "pkg-config 0.3.32 (git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes)",
 ]
 
 [[package]]
@@ -7270,7 +7270,7 @@ dependencies = [
 [[package]]
 name = "weezl"
 version = "0.1.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "whoami"
@@ -7323,7 +7323,7 @@ dependencies = [
 [[package]]
 name = "windows"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "windows-collections 0.3.2",
  "windows-core 0.62.2",
@@ -7342,7 +7342,7 @@ dependencies = [
 [[package]]
 name = "windows-collections"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7375,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "windows-core"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "windows-link 0.2.1",
  "windows-result 0.4.1",
@@ -7396,7 +7396,7 @@ dependencies = [
 [[package]]
 name = "windows-future"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7460,7 +7460,7 @@ checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
 [[package]]
 name = "windows-link"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "windows-numerics"
@@ -7504,7 +7504,7 @@ dependencies = [
 [[package]]
 name = "windows-result"
 version = "0.4.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "windows-link 0.2.1",
 ]
@@ -7521,7 +7521,7 @@ dependencies = [
 [[package]]
 name = "windows-strings"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 dependencies = [
  "windows-link 0.2.1",
 ]
@@ -8011,7 +8011,7 @@ dependencies = [
 [[package]]
 name = "zerocopy"
 version = "0.8.39"
-source = "git+https://github.com/kevinaboos/makepad?branch=base_line_fit_bound#9f0737b6a97c8820e3d0beceee7133017a943577"
+source = "git+https://github.com/kevinaboos/makepad?branch=macos_android_fixes#7622a2b9bb447fb0c81a0189a5d74b3a29b29e65"
 
 [[package]]
 name = "zerocopy-derive"
diff --git a/Cargo.toml b/Cargo.toml
index 838296e8e..7d0dcf875 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,8 +17,8 @@ metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="
 # makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "dev", features = ["serde"] }
 # makepad-code-editor = { git = "https://github.com/makepad/makepad", branch = "dev" }
 
-makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "base_line_fit_bound", features = ["serde"] }
-makepad-code-editor = { git = "https://github.com/kevinaboos/makepad", branch = "base_line_fit_bound" }
+makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "macos_android_fixes", features = ["serde"] }
+makepad-code-editor = { git = "https://github.com/kevinaboos/makepad", branch = "macos_android_fixes" }
 
 
 robius-directories = { git = "https://github.com/project-robius/robius" }
diff --git a/resources/icons/add.svg b/resources/icons/add.svg
index 17adbcd92..fdeeaf93c 100644
--- a/resources/icons/add.svg
+++ b/resources/icons/add.svg
@@ -3,4 +3,5 @@
        device-aware; round caps give the rounded stroke ends the toolbar/nav icons share. -->
   <path d="M12 5 V19"/>
   <path d="M5 12 H19"/>
+<path d="M3.98 3.98M20.02 20.02" fill="none" stroke="none"/>
 </svg>
diff --git a/resources/icons/add_attachment.svg b/resources/icons/add_attachment.svg
index 949637c84..26be9d74f 100644
--- a/resources/icons/add_attachment.svg
+++ b/resources/icons/add_attachment.svg
@@ -1,3 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
   <path d="m20.5 11.5-8.6 8.6a5.4 5.4 0 0 1-7.6-7.6l9-9a3.6 3.6 0 0 1 5.1 5.1l-9 9a1.8 1.8 0 0 1-2.5-2.5l8.2-8.2"/>
+<path d="M2.32 1.69M21.26 22.08" fill="none" stroke="none"/>
 </svg>
diff --git a/resources/icons/add_photo.svg b/resources/icons/add_photo.svg
index e80eb1160..4eb3e3106 100644
--- a/resources/icons/add_photo.svg
+++ b/resources/icons/add_photo.svg
@@ -3,4 +3,5 @@
   <circle cx="16.5" cy="9.5" r="1.1"/>
   <path d="m4 16 4.2-4.2a1.8 1.8 0 0 1 2.6 0L18 19"/>
   <path d="m14.5 15.5 1.2-1.2a1.8 1.8 0 0 1 2.6 0L21 17"/>
+<path d="M2.25 4.24M21.75 19.76" fill="none" stroke="none"/>
 </svg>
diff --git a/resources/icons/add_user.svg b/resources/icons/add_user.svg
index 640aa9d94..06b9dae4b 100644
--- a/resources/icons/add_user.svg
+++ b/resources/icons/add_user.svg
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="0 0 27 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M16 7C16 9.20914 14.2091 11 12 11C9.79086 11 8 9.20914 8 7C8 4.79086 9.79086 3 12 3C14.2091 3 16 4.79086 16 7Z" fill="#000000" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 15H16C18.2091 15 20 16.7909 20 19V21H4V19C4 16.7909 5.79086 15 8 15Z" fill="#000000" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M22.5 7.5V14.5M19 11H26" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 27 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 7C16 9.20914 14.2091 11 12 11C9.79086 11 8 9.20914 8 7C8 4.79086 9.79086 3 12 3C14.2091 3 16 4.79086 16 7Z" fill="#000000" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 15H16C18.2091 15 20 16.7909 20 19V21H4V19C4 16.7909 5.79086 15 8 15Z" fill="#000000" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M22.5 7.5V14.5M19 11H26" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.67 2.25M27.0 21.75" fill="none" stroke="none"/>
 </svg>
\ No newline at end of file
diff --git a/resources/icons/close.svg b/resources/icons/close.svg
index 4d5ee5b1b..7b9e3f0cd 100644
--- a/resources/icons/close.svg
+++ b/resources/icons/close.svg
@@ -1,3 +1,3 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.4 14L0 12.6L5.6 7L0 1.4L1.4 0L7 5.6L12.6 0L14 1.4L8.4 7L14 12.6L12.6 14L7 8.4L1.4 14Z" fill="#1C1B1F"/>
+<svg width="800px" height="800px" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.7 13.3 A0.99 0.99 0 0 1 0.7 11.9 L5.6 7 L0.7 2.1 A0.99 0.99 0 0 1 0.7 0.7 A0.99 0.99 0 0 1 2.1 0.7 L7 5.6 L11.9 0.7 A0.99 0.99 0 0 1 13.3 0.7 A0.99 0.99 0 0 1 13.3 2.1 L8.4 7 L13.3 11.9 A0.99 0.99 0 0 1 13.3 13.3 A0.99 0.99 0 0 1 11.9 13.3 L7 8.4 L2.1 13.3 A0.99 0.99 0 0 1 0.7 13.3 Z" fill="#1C1B1F"/>
 </svg>
diff --git a/resources/icons/copy.svg b/resources/icons/copy.svg
index ea7de3528..a63962872 100644
--- a/resources/icons/copy.svg
+++ b/resources/icons/copy.svg
@@ -3,6 +3,6 @@
 <rect width="20" height="20" fill="#D9D9D9"/>
 </mask>
 <g mask="url(#mask0_698_4115)">
-<path d="M7.5 15C7.04167 15 6.64931 14.8368 6.32292 14.5104C5.99653 14.184 5.83333 13.7917 5.83333 13.3333V3.33333C5.83333 2.875 5.99653 2.48264 6.32292 2.15625C6.64931 1.82986 7.04167 1.66666 7.5 1.66666H15C15.4583 1.66666 15.8507 1.82986 16.1771 2.15625C16.5035 2.48264 16.6667 2.875 16.6667 3.33333V13.3333C16.6667 13.7917 16.5035 14.184 16.1771 14.5104C15.8507 14.8368 15.4583 15 15 15H7.5ZM7.5 13.3333H15V3.33333H7.5V13.3333ZM4.16667 18.3333C3.70833 18.3333 3.31597 18.1701 2.98958 17.8437C2.66319 17.5174 2.5 17.125 2.5 16.6667V5H4.16667V16.6667H13.3333V18.3333H4.16667Z" fill="#98A2B3"/>
+<path d="M7.5 15 C7.042 15 6.649 14.837 6.323 14.51 C5.997 14.184 5.833 13.792 5.833 13.333 L5.833 3.333 C5.833 2.875 5.997 2.483 6.323 2.156 C6.649 1.83 7.042 1.667 7.5 1.667 L15 1.667 C15.458 1.667 15.851 1.83 16.177 2.156 C16.503 2.483 16.667 2.875 16.667 3.333 L16.667 13.333 C16.667 13.792 16.503 14.184 16.177 14.51 C15.851 14.837 15.458 15 15 15 L7.5 15 Z M8.25 13.333 L14.25 13.333 A0.75 0.75 0 0 0 15 12.583 L15 4.083 A0.75 0.75 0 0 0 14.25 3.333 L8.25 3.333 A0.75 0.75 0 0 0 7.5 4.083 L7.5 12.583 A0.75 0.75 0 0 0 8.25 13.333 Z M4.167 18.333 C3.708 18.333 3.316 18.17 2.99 17.844 C2.663 17.517 2.5 17.125 2.5 16.667 L2.5 5.75 A0.75 0.75 0 0 1 3.25 5 L3.417 5 A0.75 0.75 0 0 1 4.167 5.75 L4.167 16.667 L12.583 16.667 A0.75 0.75 0 0 1 13.333 17.417 L13.333 17.583 A0.75 0.75 0 0 1 12.583 18.333 L4.167 18.333 Z" fill="#98A2B3"/>
 </g>
 </svg>
diff --git a/resources/icons/eye_closed.svg b/resources/icons/eye_closed.svg
index 407e40da7..e305816dd 100644
--- a/resources/icons/eye_closed.svg
+++ b/resources/icons/eye_closed.svg
@@ -1,4 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
   <path d="M17.94 17.94A10.07 10.07 0 0 1 12 20c-7 0-11-8-11-8a18.45 18.45 0 0 1 5.06-5.94M9.9 4.24A9.12 9.12 0 0 1 12 4c7 0 11 8 11 8a18.5 18.5 0 0 1-2.16 3.19m-6.72-1.07a3 3 0 1 1-4.24-4.24"/>
   <line x1="1" y1="1" x2="23" y2="23"/>
+<path d="M0.0 0.0M24.0 24.0" fill="none" stroke="none"/>
 </svg>
diff --git a/resources/icons/eye_open.svg b/resources/icons/eye_open.svg
index ae9fe3c53..fc7e896ce 100644
--- a/resources/icons/eye_open.svg
+++ b/resources/icons/eye_open.svg
@@ -1,4 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
   <path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/>
   <circle cx="12" cy="12" r="3"/>
+<path d="M0.0 3.0M24.0 21.0" fill="none" stroke="none"/>
 </svg>
diff --git a/resources/icons/go_back.svg b/resources/icons/go_back.svg
index 07c293cf2..ffe6f4209 100644
--- a/resources/icons/go_back.svg
+++ b/resources/icons/go_back.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M5.82843 6.99955L8.36396 9.53509L6.94975 10.9493L2 5.99955L6.94975 1.0498L8.36396 2.46402L5.82843 4.99955H13C17.4183 4.99955 21 8.58127 21 12.9996C21 17.4178 17.4183 20.9996 13 20.9996H4V18.9996H13C16.3137 18.9996 19 16.3133 19 12.9996C19 9.68584 16.3137 6.99955 13 6.99955H5.82843Z"/></svg>
\ No newline at end of file
+<svg width="800px" height="800px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M5.828 7 L7.657 8.828 A1 1 0 0 1 7.657 10.242 A1 1 0 0 1 6.243 10.242 L2.707 6.707 A1 1 0 0 1 2.707 5.292 L6.243 1.757 A1 1 0 0 1 7.657 1.757 L7.657 1.757 A1 1 0 0 1 7.657 3.171 L5.828 5 L13 5 C17.418 5 21 8.581 21 13 C21 17.418 17.418 21 13 21 L5 21 A1 1 0 0 1 4 20 A1 1 0 0 1 5 19 L13 19 C16.314 19 19 16.313 19 13 C19 9.686 16.314 7 13 7 L5.828 7 Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/location-pin.svg b/resources/icons/location-pin.svg
index 06eb31a52..44cf9e0b4 100644
--- a/resources/icons/location-pin.svg
+++ b/resources/icons/location-pin.svg
@@ -2,4 +2,5 @@
   <path d="M12 21s7-5.4 7-11a7 7 0 1 0-14 0c0 5.6 7 11 7 11z"/>
   <circle cx="12" cy="10" r="2.5"/>
   <path d="M6.8 22h10.4"/>
+<path d="M4.24 2.25M19.76 22.76" fill="none" stroke="none"/>
 </svg>
diff --git a/resources/icons/pin.svg b/resources/icons/pin.svg
index a3805515f..d41cf309b 100644
--- a/resources/icons/pin.svg
+++ b/resources/icons/pin.svg
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><path d="M 20.53125 2.5625 L 19.84375 3.5 L 14.9375 10.1875 C 12.308594 9.730469 9.527344 10.472656 7.5 12.5 L 6.78125 13.1875 L 12.09375 18.5 L 4 26.59375 L 4 28 L 5.40625 28 L 13.5 19.90625 L 18.8125 25.21875 L 19.5 24.5 C 21.527344 22.472656 22.269531 19.691406 21.8125 17.0625 L 28.5 12.15625 L 29.4375 11.46875 Z M 20.78125 5.625 L 26.375 11.21875 L 20.15625 15.78125 L 19.59375 16.1875 L 19.78125 16.84375 C 20.261719 18.675781 19.738281 20.585938 18.59375 22.1875 L 9.8125 13.40625 C 11.414063 12.261719 13.324219 11.738281 15.15625 12.21875 L 15.8125 12.40625 L 16.21875 11.84375 Z"/></svg>
\ No newline at end of file
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><path d="M19.911 3.408 L14.938 10.188 C12.309 9.73 9.527 10.473 7.5 12.5 L7.446 12.551 A0.9 0.9 0 0 0 7.432 13.838 L12.094 18.5 L4.264 26.33 A0.9 0.9 0 0 0 4 26.967 L4 27.1 A0.9 0.9 0 0 0 4.9 28 L5.033 28 A0.9 0.9 0 0 0 5.67 27.736 L13.5 19.906 L18.162 24.568 A0.9 0.9 0 0 0 19.449 24.554 L19.5 24.5 C21.527 22.473 22.27 19.691 21.812 17.062 L28.592 12.089 A0.9 0.9 0 0 0 28.696 10.727 L21.273 3.304 A0.9 0.9 0 0 0 19.911 3.408 Z M21.523 6.367 L25.633 10.477 A0.9 0.9 0 0 1 25.528 11.839 L19.594 16.188 L19.781 16.844 C20.262 18.676 19.738 20.586 18.594 22.188 L9.812 13.406 C11.414 12.262 13.324 11.738 15.156 12.219 L15.812 12.406 L20.161 6.472 A0.9 0.9 0 0 1 21.523 6.367 Z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/rotate_left_fa.svg b/resources/icons/rotate_left_fa.svg
deleted file mode 100644
index a8b7e1c4f..000000000
--- a/resources/icons/rotate_left_fa.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free v7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M320 128C263.2 128 212.1 152.7 176.9 192L224 192C241.7 192 256 206.3 256 224C256 241.7 241.7 256 224 256L96 256C78.3 256 64 241.7 64 224L64 96C64 78.3 78.3 64 96 64C113.7 64 128 78.3 128 96L128 150.7C174.9 97.6 243.5 64 320 64C461.4 64 576 178.6 576 320C576 461.4 461.4 576 320 576C233 576 156.1 532.6 109.9 466.3C99.8 451.8 103.3 431.9 117.8 421.7C132.3 411.5 152.2 415.1 162.4 429.6C197.2 479.4 254.8 511.9 320 511.9C426 511.9 512 425.9 512 319.9C512 213.9 426 128 320 128z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/rotate_right.svg b/resources/icons/rotate_right.svg
new file mode 100644
index 000000000..d4ca6e2b2
--- /dev/null
+++ b/resources/icons/rotate_right.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="800px" height="800px" viewBox="0 0 24 24" fill="#000000" fill-rule="evenodd">
+  <path d="M4.535 7.013 H12.075 A3.78 3.78 0 0 1 15.855 10.793 V18.332 A3.78 3.78 0 0 1 12.075 22.113 H4.535 A3.78 3.78 0 0 1 0.755 18.332 V10.793 A3.78 3.78 0 0 1 4.535 7.013 Z M4.535 8.912 A1.88 1.88 0 0 0 2.655 10.793 V18.332 A1.88 1.88 0 0 0 4.535 20.212 H12.075 A1.88 1.88 0 0 0 13.955 18.332 V10.793 A1.88 1.88 0 0 0 12.075 8.912 Z"/>
+  <path d="M11.605 1.888 L17.605 1.888 A3.375 3.375 0 0 1 20.98 5.263 L20.98 14.463 A0.875 0.875 0 0 1 19.23 14.463 L19.23 5.263 A1.625 1.625 0 0 0 17.605 3.638 L11.605 3.638 A0.875 0.875 0 0 1 11.605 1.888 Z"/>
+  <path d="M18.672 10.941 L20.105 12.954 L21.538 10.941 A0.875 0.875 0 0 1 22.964 11.956 L20.818 14.97 A0.875 0.875 0 0 1 19.392 14.97 L17.246 11.956 A0.875 0.875 0 1 1 18.672 10.941 Z"/>
+</svg>
diff --git a/resources/icons/rotate_right_fa.svg b/resources/icons/rotate_right_fa.svg
deleted file mode 100644
index 0c620a417..000000000
--- a/resources/icons/rotate_right_fa.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free v7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M500.7 138.7L512 149.4L512 96C512 78.3 526.3 64 544 64C561.7 64 576 78.3 576 96L576 224C576 241.7 561.7 256 544 256L416 256C398.3 256 384 241.7 384 224C384 206.3 398.3 192 416 192L463.9 192L456.3 184.8C456.1 184.6 455.9 184.4 455.7 184.2C380.7 109.2 259.2 109.2 184.2 184.2C109.2 259.2 109.2 380.7 184.2 455.7C259.2 530.7 380.7 530.7 455.7 455.7C463.9 447.5 471.2 438.8 477.6 429.6C487.7 415.1 507.7 411.6 522.2 421.7C536.7 431.8 540.2 451.8 530.1 466.3C521.6 478.5 511.9 490.1 501 501C401 601 238.9 601 139 501C39.1 401 39 239 139 139C238.9 39.1 400.7 39 500.7 138.7z"/></svg>
\ No newline at end of file
diff --git a/resources/icons/send.svg b/resources/icons/send.svg
index f397a3771..3aec87f88 100644
--- a/resources/icons/send.svg
+++ b/resources/icons/send.svg
@@ -4,4 +4,5 @@
   <path d="M13.2 19 10.4 13.4"/>
   <path d="M10.4 13.4 5 10.8"/>
   <path d="M10.4 13.4 19 5"/>
+<path d="M4.41 4.41M19.59 19.59" fill="none" stroke="none"/>
 </svg>
diff --git a/resources/icons/send_encrypted.svg b/resources/icons/send_encrypted.svg
index 99fce6c47..30a96d0a1 100644
--- a/resources/icons/send_encrypted.svg
+++ b/resources/icons/send_encrypted.svg
@@ -7,4 +7,5 @@
   <path stroke-width="0.7" d="M4.6 16.85 H7.5 A0.85 0.85 0 0 1 8.35 17.7 V19.4 A0.85 0.85 0 0 1 7.5 20.25 H4.6 A0.85 0.85 0 0 1 3.75 19.4 V17.7 A0.85 0.85 0 0 1 4.6 16.85 Z"/>
   <path stroke-width="0.7" d="M4.85 16.85 V15.75 A1.2 1.2 0 0 1 7.25 15.75 V16.85"/>
   <path stroke-width="0.7" d="M6.05 18.05 V18.65"/>
+<path d="M3.4 4.55M19.45 20.6" fill="none" stroke="none"/>
 </svg>
diff --git a/resources/icons/send_unencrypted.svg b/resources/icons/send_unencrypted.svg
index ad6ce21e5..9a0d3b059 100644
--- a/resources/icons/send_unencrypted.svg
+++ b/resources/icons/send_unencrypted.svg
@@ -7,4 +7,5 @@
   <path stroke-width="0.7" d="M5 17.25 H7.9 A0.85 0.85 0 0 1 8.75 18.1 V19.8 A0.85 0.85 0 0 1 7.9 20.65 H5 A0.85 0.85 0 0 1 4.15 19.8 V18.1 A0.85 0.85 0 0 1 5 17.25 Z"/>
   <path stroke-width="0.7" d="M6.1 17.25 V15.4 A1.4 1.4 0 0 0 3.3 15.4 V15.8"/>
   <path stroke-width="0.7" d="M6.45 18.45 V19.05"/>
+<path d="M2.95 4.55M19.45 21.0" fill="none" stroke="none"/>
 </svg>
diff --git a/resources/icons/share.svg b/resources/icons/share.svg
index 8f0de62c7..58f99b435 100644
--- a/resources/icons/share.svg
+++ b/resources/icons/share.svg
@@ -1,5 +1,6 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#1C274C" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg">
-  <path d="M12 3.75 V16.5"/>
-  <path d="M8.25 7.5 L12 3.75 L15.75 7.5"/>
-  <path d="M15.5 12 H18 a2 2 0 0 1 2 2 V20 a2 2 0 0 1 -2 2 H6 a2 2 0 0 1 -2 -2 V14 a2 2 0 0 1 2 -2 H8.5"/>
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.25 16.5V3.75C11.25 3.33579 11.5858 3 12 3C12.4142 3 12.75 3.33579 12.75 3.75V16.5C12.75 16.9142 12.4142 17.25 12 17.25C11.5858 17.25 11.25 16.9142 11.25 16.5Z" fill="#1C274C" stroke="#1C274C" stroke-width="1.0" stroke-linejoin="round"/>
+<path d="M7.7197 6.9697L11.4697 3.2197A0.75 0.75 0 0 1 12.5303 3.2197L16.2803 6.9697A0.75 0.75 0 0 1 15.2197 8.0303L12 4.8107L8.7803 8.0303A0.75 0.75 0 0 1 7.7197 6.9697Z" fill="#1C274C" stroke="#1C274C" stroke-width="1.0" stroke-linejoin="round"/>
+<path d="M8.5 11.25L6 11.25A2.75 2.75 0 0 0 3.25 14L3.25 20A2.75 2.75 0 0 0 6 22.75L18 22.75A2.75 2.75 0 0 0 20.75 20L20.75 14A2.75 2.75 0 0 0 18 11.25L15.5 11.25A0.75 0.75 0 0 0 15.5 12.75L18 12.75A1.25 1.25 0 0 1 19.25 14L19.25 20A1.25 1.25 0 0 1 18 21.25L6 21.25A1.25 1.25 0 0 1 4.75 20L4.75 14A1.25 1.25 0 0 1 6 12.75L8.5 12.75A0.75 0.75 0 0 0 8.5 11.25Z" fill="#1C274C" stroke="#1C274C" stroke-width="1.0" stroke-linejoin="round"/>
 </svg>
diff --git a/resources/icons/view_source.svg b/resources/icons/view_source.svg
index a44344268..3a87de34c 100644
--- a/resources/icons/view_source.svg
+++ b/resources/icons/view_source.svg
@@ -1,44 +1,42 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg height="800px" width="800px" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
-	 viewBox="0 0 502.664 502.664" xml:space="preserve">
-<g>
-	<g>
-		<path style="fill:#010002;" d="M153.821,358.226L0,274.337v-46.463l153.821-83.414v54.574L46.636,250.523l107.185,53.431
-			C153.821,303.954,153.821,358.226,153.821,358.226z"/>
-		<path style="fill:#010002;" d="M180.094,387.584L282.103,115.08h32.227L212.084,387.584H180.094z"/>
-		<path style="fill:#010002;" d="M348.843,358.226v-54.272l107.164-52.999l-107.164-52.59v-53.927l153.821,83.522v46.183
-			L348.843,358.226z"/>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-	<g>
-	</g>
-</g>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg height="800px" width="800px" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 viewBox="0 0 502.664 502.664" xml:space="preserve">
+<g>
+	<g>
+		<path style="fill:#010002;" d="M118.976 339.223 L13.551 281.727 A26 26 0 0 1 0 258.901 L0 243.352 A26 26 0 0 1 13.606 220.496 L118.917 163.388 A23.637 23.637 0 0 1 153.821 184.166 A23.637 23.637 0 0 1 140.419 205.472 L46.636 250.523 L140.77 297.448 A23.563 23.563 0 0 1 153.821 318.536 A23.563 23.563 0 0 1 118.976 339.223 Z"/>
+		<path style="fill:#010002;" d="M187.669 367.347 L278.436 124.875 A15.083 15.083 0 0 1 292.562 115.08 A15.083 15.083 0 0 1 306.683 135.461 L215.731 377.864 A14.984 14.984 0 0 1 201.702 387.584 A14.984 14.984 0 0 1 187.669 367.347 Z"/>
+		<path style="fill:#010002;" d="M348.843 318.562 A23.522 23.522 0 0 1 361.937 297.478 L456.007 250.955 L361.937 204.791 A23.405 23.405 0 0 1 348.843 183.779 A23.405 23.405 0 0 1 383.416 163.211 L489.071 220.579 A26 26 0 0 1 502.664 243.428 L502.664 258.724 A26 26 0 0 1 489.135 281.538 L383.647 339.201 A23.522 23.522 0 0 1 348.843 318.562 Z"/>
+	</g>
+	<g>
+	</g>
+	<g>
+	</g>
+	<g>
+	</g>
+	<g>
+	</g>
+	<g>
+	</g>
+	<g>
+	</g>
+	<g>
+	</g>
+	<g>
+	</g>
+	<g>
+	</g>
+	<g>
+	</g>
+	<g>
+	</g>
+	<g>
+	</g>
+	<g>
+	</g>
+	<g>
+	</g>
+	<g>
+	</g>
+</g>
 </svg>
\ No newline at end of file
diff --git a/resources/icons/zoom_to_fit.svg b/resources/icons/zoom_to_fit.svg
new file mode 100644
index 000000000..f0fca19a9
--- /dev/null
+++ b/resources/icons/zoom_to_fit.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="800px" height="800px" viewBox="0 0 24 24" fill="#000000" fill-rule="evenodd">
+  <path d="M2 8.4 L2 4.5 A2.5 2.5 0 0 1 4.5 2 L8.4 2 A1 1 0 0 1 8.4 4 L4.5 4 A0.5 0.5 0 0 0 4 4.5 L4 8.4 A1 1 0 0 1 2 8.4 Z"/>
+  <path d="M5.207 3.793 L10.207 8.793 A1 1 0 0 1 8.793 10.207 L3.793 5.207 A1 1 0 0 1 5.207 3.793 Z"/>
+  <path d="M20 8.4 L20 4.5 A0.5 0.5 0 0 0 19.5 4 L15.6 4 A1 1 0 0 1 15.6 2 L19.5 2 A2.5 2.5 0 0 1 22 4.5 L22 8.4 A1 1 0 0 1 20 8.4 Z"/>
+  <path d="M20.207 5.207 L15.207 10.207 A1 1 0 0 1 13.793 8.793 L18.793 3.793 A1 1 0 1 1 20.207 5.207 Z"/>
+  <path d="M22 15.6 L22 19.5 A2.5 2.5 0 0 1 19.5 22 L15.6 22 A1 1 0 0 1 15.6 20 L19.5 20 A0.5 0.5 0 0 0 20 19.5 L20 15.6 A1 1 0 0 1 22 15.6 Z"/>
+  <path d="M18.793 20.207 L13.793 15.207 A1 1 0 0 1 15.207 13.793 L20.207 18.793 A1 1 0 0 1 18.793 20.207 Z"/>
+  <path d="M4 15.6 L4 19.5 A0.5 0.5 0 0 0 4.5 20 L8.4 20 A1 1 0 0 1 8.4 22 L4.5 22 A2.5 2.5 0 0 1 2 19.5 L2 15.6 A1 1 0 0 1 4 15.6 Z"/>
+  <path d="M3.793 18.793 L8.793 13.793 A1 1 0 0 1 10.207 15.207 L5.207 20.207 A1 1 0 0 1 3.793 18.793 Z"/>
+</svg>
diff --git a/src/shared/image_viewer.rs b/src/shared/image_viewer.rs
index f83d7d0ef..5bb8340a3 100644
--- a/src/shared/image_viewer.rs
+++ b/src/shared/image_viewer.rs
@@ -304,17 +304,14 @@ script_mod! {
                     icon_walk: Walk{width: 27, height: 27, margin: Inset{left: 2}}
                 }
 
-                rotate_ccw_button := mod.widgets.ImageViewerButton {
-                    draw_icon +: { svg: (ICON_ROTATE_CCW) }
-                }
-
                 rotate_cw_button := mod.widgets.ImageViewerButton {
                     draw_icon +: { svg: (ICON_ROTATE_CW) }
+                    icon_walk: Walk{width: 30, height: 30, margin: Inset{left: 2}}
                 }
 
-                reset_button := mod.widgets.ImageViewerButton {
-                    draw_icon +: { svg: (ICON_JUMP) }
-                    icon_walk: Walk{width: 25, height: 25, margin: Inset{bottom: 2}}
+                zoom_to_fit_button := mod.widgets.ImageViewerButton {
+                    draw_icon +: { svg: (ICON_ZOOM_TO_FIT) }
+                    icon_walk: Walk{width: 25, height: 25}
                 }
 
                 download_button := mod.widgets.ImageViewerButton {
@@ -324,7 +321,7 @@ script_mod! {
 
                 share_button := mod.widgets.ImageViewerButton {
                     draw_icon +: { svg: (ICON_SHARE) }
-                    icon_walk: Walk{width: 22, height: 22}
+                    icon_walk: Walk{width: 24, height: 24}
                 }
 
                 close_button := mod.widgets.ImageViewerButton {
@@ -717,7 +714,7 @@ impl MatchEvent for ImageViewer {
         }
 
         let mut was_overlay_button_clicked = false;
-        if self.view.button(cx, ids!(reset_button)).clicked(actions) {
+        if self.view.button(cx, ids!(zoom_to_fit_button)).clicked(actions) {
             was_overlay_button_clicked = true;
             self.reset(cx);
         }
@@ -736,11 +733,6 @@ impl MatchEvent for ImageViewer {
             self.start_rotation(cx, 90.0);
         }
 
-        if self.view.button(cx, ids!(rotate_ccw_button)).clicked(actions) {
-            was_overlay_button_clicked = true;
-            self.start_rotation(cx, -90.0);
-        }
-
         if let Some(info) = self.downloadable.as_ref() {
             if self.view.button(cx, ids!(download_button)).clicked(actions) {
                 was_overlay_button_clicked = true;
diff --git a/src/shared/styles.rs b/src/shared/styles.rs
index 454db2d6e..0267a2aef 100644
--- a/src/shared/styles.rs
+++ b/src/shared/styles.rs
@@ -15,8 +15,7 @@ script_mod! {
     mod.widgets.ICON_CLOSE            = crate_resource("self://resources/icons/close.svg")
     mod.widgets.ICON_CLOUD_CHECKMARK  = crate_resource("self://resources/icons/cloud_checkmark.svg")
     mod.widgets.ICON_CLOUD_OFFLINE    = crate_resource("self://resources/icons/cloud_offline.svg")
-    mod.widgets.ICON_ROTATE_CW        = crate_resource("self://resources/icons/rotate_right_fa.svg")
-    mod.widgets.ICON_ROTATE_CCW       = crate_resource("self://resources/icons/rotate_left_fa.svg")
+    mod.widgets.ICON_ROTATE_CW        = crate_resource("self://resources/icons/rotate_right.svg")
     mod.widgets.ICON_COPY             = crate_resource("self://resources/icons/copy.svg")
     mod.widgets.ICON_DOWNLOAD         = crate_resource("self://resources/icons/download.svg")
     mod.widgets.ICON_EDIT             = crate_resource("self://resources/icons/edit.svg")
@@ -51,6 +50,7 @@ script_mod! {
     mod.widgets.ICON_WARNING          = crate_resource("self://resources/icons/warning.svg")
     mod.widgets.ICON_ZOOM_IN          = crate_resource("self://resources/icons/zoom_in.svg")
     mod.widgets.ICON_ZOOM_OUT         = crate_resource("self://resources/icons/zoom_out.svg")
+    mod.widgets.ICON_ZOOM_TO_FIT      = crate_resource("self://resources/icons/zoom_to_fit.svg")
     mod.widgets.ICON_ADD_ATTACHMENT   = crate_resource("self://resources/icons/add_attachment.svg")
     mod.widgets.ICON_FILE             = crate_resource("self://resources/icons/file.svg")