diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e262b957e..1ca4411c9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -68,7 +68,7 @@ jobs:
     strategy:
       matrix:
         toolchain:
-          - 1.65.0
+          - 1.70.0
           - nightly
         os:
           - ubuntu-latest
diff --git a/contrib/reproducible/guix/build.sh b/contrib/reproducible/guix/build.sh
index 149972320..482632a51 100755
--- a/contrib/reproducible/guix/build.sh
+++ b/contrib/reproducible/guix/build.sh
@@ -20,7 +20,7 @@ replace-with = "vendored_sources"
 
 [source."https://github.com/edouardparis/iced"]
 git = "https://github.com/edouardparis/iced"
-branch = "fix-futures-recipe"
+branch = "patch-0.12.3"
 replace-with = "vendored_sources"
 EOF
 
diff --git a/gui/Cargo.lock b/gui/Cargo.lock
index 0132d73df..88652c999 100644
--- a/gui/Cargo.lock
+++ b/gui/Cargo.lock
@@ -23,12 +23,6 @@ dependencies = [
  "mach 0.1.2",
 ]
 
-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-
 [[package]]
 name = "ab_glyph"
 version = "0.2.20"
@@ -97,9 +91,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
  "getrandom",
  "once_cell",
@@ -113,6 +107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
+ "getrandom",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -139,6 +134,33 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
+[[package]]
+name = "android-activity"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289"
+dependencies = [
+ "android-properties",
+ "bitflags 2.4.2",
+ "cc",
+ "cesu8",
+ "jni",
+ "jni-sys",
+ "libc",
+ "log",
+ "ndk",
+ "ndk-context",
+ "ndk-sys",
+ "num_enum",
+ "thiserror",
+]
+
+[[package]]
+name = "android-properties"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -171,23 +193,23 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
 [[package]]
 name = "arrayvec"
-version = "0.5.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
-name = "arrayvec"
-version = "0.7.4"
+name = "as-raw-xcb-connection"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
 
 [[package]]
 name = "ash"
-version = "0.37.2+1.3.238"
+version = "0.37.3+1.3.251"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03"
+checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
 dependencies = [
- "libloading",
+ "libloading 0.7.4",
 ]
 
 [[package]]
@@ -219,9 +241,15 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.60",
 ]
 
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -453,6 +481,25 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "block-sys"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7"
+dependencies = [
+ "objc-sys",
+]
+
+[[package]]
+name = "block2"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68"
+dependencies = [
+ "block-sys",
+ "objc2",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.12.0"
@@ -476,7 +523,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -514,15 +561,28 @@ dependencies = [
 
 [[package]]
 name = "calloop"
-version = "0.10.5"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a59225be45a478d772ce015d9743e49e92798ece9e34eda9a6aa2a6a7f40192"
+checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298"
 dependencies = [
+ "bitflags 2.4.2",
  "log",
- "nix 0.25.1",
- "slotmap",
+ "polling",
+ "rustix 0.38.34",
+ "slab",
  "thiserror",
- "vec_map",
+]
+
+[[package]]
+name = "calloop-wayland-source"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02"
+dependencies = [
+ "calloop",
+ "rustix 0.38.34",
+ "wayland-backend",
+ "wayland-client",
 ]
 
 [[package]]
@@ -530,6 +590,15 @@ name = "cc"
 version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+dependencies = [
+ "jobserver",
+]
+
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
 
 [[package]]
 name = "cfg-if"
@@ -538,13 +607,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
-name = "cgl"
-version = "0.3.2"
+name = "cfg_aliases"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff"
-dependencies = [
- "libc",
-]
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f"
 
 [[package]]
 name = "chacha20"
@@ -570,12 +642,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "checked_int_cast"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919"
-
 [[package]]
 name = "chrono"
 version = "0.4.24"
@@ -604,13 +670,11 @@ dependencies = [
 
 [[package]]
 name = "clipboard-win"
-version = "4.5.0"
+version = "5.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
+checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad"
 dependencies = [
  "error-code",
- "str-buf",
- "winapi",
 ]
 
 [[package]]
@@ -626,44 +690,35 @@ dependencies = [
 
 [[package]]
 name = "clipboard_wayland"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f6364a9f7a66f2ac1a1a098aa1c7f6b686f2496c6ac5e5c0d773445df912747"
+checksum = "003f886bc4e2987729d10c1db3424e7f80809f3fc22dbc16c685738887cb37b8"
 dependencies = [
  "smithay-clipboard",
 ]
 
 [[package]]
 name = "clipboard_x11"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "983a7010836ecd04dde2c6d27a0cb56ec5d21572177e782bdcb24a600124e921"
+checksum = "4274ea815e013e0f9f04a2633423e14194e408a0576c943ce3d14ca56c50031c"
 dependencies = [
  "thiserror",
  "x11rb",
 ]
 
-[[package]]
-name = "cmake"
-version = "0.1.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "cocoa"
-version = "0.24.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
+checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
 dependencies = [
  "bitflags 1.3.2",
  "block",
  "cocoa-foundation",
  "core-foundation",
  "core-graphics",
- "foreign-types 0.3.2",
+ "foreign-types 0.5.0",
  "libc",
  "objc",
 ]
@@ -715,10 +770,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
-name = "com-rs"
-version = "0.2.1"
+name = "com"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6"
+dependencies = [
+ "com_macros",
+]
+
+[[package]]
+name = "com_macros"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5"
+dependencies = [
+ "com_macros_support",
+ "proc-macro2",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "com_macros_support"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
 
 [[package]]
 name = "const-oid"
@@ -748,17 +847,11 @@ dependencies = [
  "tiny-keccak",
 ]
 
-[[package]]
-name = "const_panic"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58baae561b85ca19b3122a9ddd35c8ec40c3bcd14fe89921824eae73f7baffbf"
-
 [[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -766,54 +859,62 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "core-graphics"
-version = "0.22.3"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
  "core-graphics-types",
- "foreign-types 0.3.2",
+ "foreign-types 0.5.0",
  "libc",
 ]
 
 [[package]]
 name = "core-graphics-types"
-version = "0.1.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
- "foreign-types 0.3.2",
  "libc",
 ]
 
 [[package]]
-name = "core-text"
-version = "19.2.0"
+name = "core2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25"
+checksum = "239fa3ae9b63c2dc74bd3fa852d4792b8b305ae64eeede946265b6af62f1fff3"
 dependencies = [
- "core-foundation",
- "core-graphics",
- "foreign-types 0.3.2",
- "libc",
+ "memchr",
 ]
 
 [[package]]
-name = "core2"
-version = "0.3.3"
+name = "cosmic-text"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239fa3ae9b63c2dc74bd3fa852d4792b8b305ae64eeede946265b6af62f1fff3"
+checksum = "75acbfb314aeb4f5210d379af45ed1ec2c98c7f1790bf57b8a4c562ac0c51b71"
 dependencies = [
- "memchr",
+ "fontdb",
+ "libm",
+ "log",
+ "rangemap",
+ "rustc-hash",
+ "rustybuzz 0.11.0",
+ "self_cell",
+ "swash",
+ "sys-locale",
+ "unicode-bidi",
+ "unicode-linebreak",
+ "unicode-script",
+ "unicode-segmentation",
 ]
 
 [[package]]
@@ -877,29 +978,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "crossfont"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21fd3add36ea31aba1520aa5288714dd63be506106753226d0eb387a93bc9c45"
-dependencies = [
- "cocoa",
- "core-foundation",
- "core-foundation-sys",
- "core-graphics",
- "core-text",
- "dwrote",
- "foreign-types 0.5.0",
- "freetype-rs",
- "libc",
- "log",
- "objc",
- "once_cell",
- "pkg-config",
- "servo-fontconfig",
- "winapi",
-]
-
 [[package]]
 name = "crunchy"
 version = "0.2.2"
@@ -928,6 +1006,16 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "ctor"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"
+dependencies = [
+ "quote",
+ "syn 2.0.60",
+]
+
 [[package]]
 name = "ctr"
 version = "0.9.2"
@@ -938,10 +1026,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "cty"
-version = "0.2.2"
+name = "cursor-icon"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
+checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
 
 [[package]]
 name = "curve25519-dalek"
@@ -967,7 +1055,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -994,7 +1082,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.43",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -1011,60 +1099,25 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.60",
 ]
 
 [[package]]
 name = "d3d12"
-version = "0.6.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
+checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307"
 dependencies = [
- "bitflags 1.3.2",
- "libloading",
+ "bitflags 2.4.2",
+ "libloading 0.8.1",
  "winapi",
 ]
 
-[[package]]
-name = "darling"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
-dependencies = [
- "darling_core",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "data-url"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5"
+checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
 
 [[package]]
 name = "der"
@@ -1136,11 +1189,11 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
 [[package]]
 name = "dlib"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794"
+checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading",
+ "libloading 0.8.1",
 ]
 
 [[package]]
@@ -1165,17 +1218,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
 [[package]]
-name = "dwrote"
-version = "0.11.0"
+name = "drm"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b"
+checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde"
+dependencies = [
+ "bitflags 2.4.2",
+ "bytemuck",
+ "drm-ffi",
+ "drm-fourcc",
+ "rustix 0.38.34",
+]
+
+[[package]]
+name = "drm-ffi"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6"
+dependencies = [
+ "drm-sys",
+ "rustix 0.38.34",
+]
+
+[[package]]
+name = "drm-fourcc"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
+
+[[package]]
+name = "drm-sys"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176"
 dependencies = [
- "lazy_static",
  "libc",
- "serde",
- "serde_derive",
- "winapi",
- "wio",
+ "linux-raw-sys 0.6.4",
 ]
 
 [[package]]
@@ -1218,81 +1296,44 @@ dependencies = [
 ]
 
 [[package]]
-name = "encase"
-version = "0.3.0"
+name = "encoding_rs"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a516181e9a36e8982cb37933c5e7dba638c42938cacde46ee4e5b4156f881b9"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
 dependencies = [
- "const_panic",
- "encase_derive",
- "glam",
- "thiserror",
+ "cfg-if",
 ]
 
 [[package]]
-name = "encase_derive"
-version = "0.3.0"
+name = "equivalent"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5b802412eea315f29f2bb2da3a5963cd6121f56eaa06aebcdc0c54eea578f22"
-dependencies = [
- "encase_derive_impl",
-]
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
-name = "encase_derive_impl"
-version = "0.3.0"
+name = "errno"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f2f4de457d974f548d2c2a16f709ebd81013579e543bd1a9b19ced88132c2cf"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "errno"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
-dependencies = [
- "errno-dragonfly",
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
+name = "error-code"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
+checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
 
 [[package]]
-name = "error-code"
-version = "2.3.1"
+name = "etagere"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
+checksum = "306960881d6c46bd0dd6b7f07442a441418c08d0d3e63d8d080b0f64c6343e4e"
 dependencies = [
- "libc",
- "str-buf",
+ "euclid",
+ "svg_fmt",
 ]
 
 [[package]]
@@ -1304,16 +1345,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "expat-sys"
-version = "2.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa"
-dependencies = [
- "cmake",
- "pkg-config",
-]
-
 [[package]]
 name = "exr"
 version = "1.6.3"
@@ -1342,6 +1373,12 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
 
+[[package]]
+name = "fast-srgb8"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1"
+
 [[package]]
 name = "fastrand"
 version = "1.9.0"
@@ -1351,6 +1388,12 @@ dependencies = [
  "instant",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
 [[package]]
 name = "fern"
 version = "0.6.2"
@@ -1388,15 +1431,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "find-crate"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2"
-dependencies = [
- "toml",
-]
-
 [[package]]
 name = "fixedbitset"
 version = "0.4.2"
@@ -1447,6 +1481,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "font-types"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bd7f3ea17572640b606b35df42cfb6ecdf003704b062580e59918692190b73d"
+
 [[package]]
 name = "fontconfig-parser"
 version = "0.5.2"
@@ -1458,14 +1498,16 @@ dependencies = [
 
 [[package]]
 name = "fontdb"
-version = "0.12.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff20bef7942a72af07104346154a70a70b089c572e454b41bef6eb6cb10e9c06"
+checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38"
 dependencies = [
  "fontconfig-parser",
  "log",
- "memmap2",
- "ttf-parser",
+ "memmap2 0.8.0",
+ "slotmap",
+ "tinyvec",
+ "ttf-parser 0.19.2",
 ]
 
 [[package]]
@@ -1495,7 +1537,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -1519,28 +1561,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "freetype-rs"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb"
-dependencies = [
- "bitflags 1.3.2",
- "freetype-sys",
- "libc",
-]
-
-[[package]]
-name = "freetype-sys"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a"
-dependencies = [
- "cmake",
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "futures"
 version = "0.3.28"
@@ -1598,7 +1618,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -1631,15 +1651,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -1653,12 +1664,12 @@ dependencies = [
 
 [[package]]
 name = "gethostname"
-version = "0.2.3"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e"
+checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
 dependencies = [
  "libc",
- "winapi",
+ "windows-targets 0.48.0",
 ]
 
 [[package]]
@@ -1713,27 +1724,15 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.21.3"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "518faa5064866338b013ff9b2350dc318e14cc4fcd6cb8206d7e7c9886c98815"
+checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
 
 [[package]]
 name = "glow"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919"
-dependencies = [
- "js-sys",
- "slotmap",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "glow"
-version = "0.12.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e007a07a24de5ecae94160f141029e9a347282cfe25d1d58d85d845cf3130f1"
+checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1"
 dependencies = [
  "js-sys",
  "slotmap",
@@ -1741,151 +1740,57 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "glow_glyph"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f4e62c64947b9a24fe20e2bba9ad819ecb506ef5c8df7ffc4737464c6df9510"
-dependencies = [
- "bytemuck",
- "glow 0.11.2",
- "glyph_brush",
- "log",
-]
-
-[[package]]
-name = "glutin"
-version = "0.29.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444c9ad294fdcaf20ccf6726b78f380b5450275540c9b68ab62f49726ad1c713"
-dependencies = [
- "cgl",
- "cocoa",
- "core-foundation",
- "glutin_egl_sys",
- "glutin_gles2_sys",
- "glutin_glx_sys",
- "glutin_wgl_sys",
- "libloading",
- "log",
- "objc",
- "once_cell",
- "osmesa-sys",
- "parking_lot 0.12.1",
- "raw-window-handle 0.5.2",
- "wayland-client",
- "wayland-egl",
- "winapi",
- "winit",
-]
-
-[[package]]
-name = "glutin_egl_sys"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68900f84b471f31ea1d1355567eb865a2cf446294f06cef8d653ed7bcf5f013d"
-dependencies = [
- "gl_generator",
- "winapi",
-]
-
-[[package]]
-name = "glutin_gles2_sys"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8094e708b730a7c8a1954f4f8a31880af00eb8a1c5b5bf85d28a0a3c6d69103"
-dependencies = [
- "gl_generator",
- "objc",
-]
-
-[[package]]
-name = "glutin_glx_sys"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d93d0575865098580c5b3a423188cd959419912ea60b1e48e8b3b526f6d02468"
-dependencies = [
- "gl_generator",
- "x11-dl",
-]
-
 [[package]]
 name = "glutin_wgl_sys"
-version = "0.1.5"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da5951a1569dbab865c6f2a863efafff193a93caf05538d193e9e3816d21696"
+checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead"
 dependencies = [
  "gl_generator",
 ]
 
 [[package]]
-name = "glyph_brush"
-version = "0.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4edefd123f28a0b1d41ec4a489c2b43020b369180800977801611084f342978d"
-dependencies = [
- "glyph_brush_draw_cache",
- "glyph_brush_layout",
- "ordered-float",
- "rustc-hash",
- "twox-hash",
-]
-
-[[package]]
-name = "glyph_brush_draw_cache"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6010675390f6889e09a21e2c8b575b3ee25667ea8237a8d59423f73cb8c28610"
-dependencies = [
- "ab_glyph",
- "crossbeam-channel",
- "crossbeam-deque",
- "linked-hash-map",
- "rayon",
- "rustc-hash",
-]
-
-[[package]]
-name = "glyph_brush_layout"
-version = "0.2.3"
+name = "glyphon"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38"
+checksum = "6a62d0338e4056db6a73221c2fb2e30619452f6ea9651bac4110f51b0f7a7581"
 dependencies = [
- "ab_glyph",
- "approx",
- "xi-unicode",
+ "cosmic-text",
+ "etagere",
+ "lru",
+ "wgpu",
 ]
 
 [[package]]
 name = "gpu-alloc"
-version = "0.5.3"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d"
+checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "gpu-alloc-types",
 ]
 
 [[package]]
 name = "gpu-alloc-types"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
+checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
 ]
 
 [[package]]
 name = "gpu-allocator"
-version = "0.22.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8"
+checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884"
 dependencies = [
- "backtrace",
  "log",
+ "presser",
  "thiserror",
  "winapi",
- "windows 0.44.0",
+ "windows 0.52.0",
 ]
 
 [[package]]
@@ -1963,7 +1868,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.7.8",
 ]
 
 [[package]]
@@ -1993,14 +1898,14 @@ dependencies = [
 
 [[package]]
 name = "hassle-rs"
-version = "0.9.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85"
+checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890"
 dependencies = [
- "bitflags 1.3.2",
- "com-rs",
+ "bitflags 2.4.2",
+ "com",
  "libc",
- "libloading",
+ "libloading 0.8.1",
  "thiserror",
  "widestring",
  "winapi",
@@ -2023,9 +1928,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.2"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hex"
@@ -2174,17 +2079,14 @@ dependencies = [
 
 [[package]]
 name = "iced"
-version = "0.9.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbddf356d01e9d41cd394a9d04d62bfd89650a30f12fda5839cabb8c4591c88"
+checksum = "7d4eb0fbbefb8c428b70680e77ed9013887b17c1d6be366b40f264f956d1a096"
 dependencies = [
  "iced_core",
  "iced_futures",
- "iced_glow",
- "iced_glutin",
- "iced_graphics",
- "iced_native",
- "iced_wgpu",
+ "iced_renderer",
+ "iced_widget",
  "iced_winit",
  "image",
  "thiserror",
@@ -2192,145 +2094,159 @@ dependencies = [
 
 [[package]]
 name = "iced_core"
-version = "0.9.0"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11e1942e28dedee756cc27e67e7a838cdc1e59fb6bf9627ec9f709ab3b135782"
+checksum = "7d7e6bbd197f311ed3d8b71651876b0ce01318fde52cda862a9a7a4373c9b930"
 dependencies = [
- "bitflags 1.3.2",
- "instant",
+ "bitflags 2.4.2",
+ "glam",
+ "log",
+ "num-traits",
  "palette",
+ "raw-window-handle",
+ "smol_str",
+ "thiserror",
+ "web-time",
+ "xxhash-rust",
 ]
 
 [[package]]
 name = "iced_futures"
-version = "0.6.0"
-source = "git+https://github.com/edouardparis/iced?branch=fix-futures-recipe#2d8318b13bdf8aaf31bc6d5a72b22313ed2d10cf"
+version = "0.12.3"
+source = "git+https://github.com/edouardparis/iced?branch=patch-0.12.3#459c8eb3da2ae21461ee56baea8a1b10d38ff6e0"
 dependencies = [
  "futures",
+ "iced_core",
  "log",
  "tokio",
  "wasm-bindgen-futures",
  "wasm-timer",
 ]
 
-[[package]]
-name = "iced_glow"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc5b081015f5c75777c96ad75e2288916e7d444c97396d6d136517877ef9129"
-dependencies = [
- "bytemuck",
- "euclid",
- "glow 0.11.2",
- "glow_glyph",
- "glyph_brush",
- "iced_graphics",
- "iced_native",
- "log",
-]
-
-[[package]]
-name = "iced_glutin"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c427ca018d29508512581d832fbaa7b6c8ec34c39d438f35f59e363a6419953"
-dependencies = [
- "glutin",
- "iced_graphics",
- "iced_native",
- "iced_winit",
- "log",
-]
-
 [[package]]
 name = "iced_graphics"
-version = "0.8.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "338a6aff7db906537074ad0fe8b720cfdb9512cdfea43c628c76bd1cf50fdcc0"
+checksum = "6a044c193ef0840eacabfa05424717331d1fc5b3ecb9a89316200c75da2ba9a4"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "bytemuck",
- "glam",
- "iced_native",
- "iced_style",
+ "cosmic-text",
+ "half",
+ "iced_core",
+ "iced_futures",
  "image",
  "kamadak-exif",
  "log",
- "lyon",
- "qrcode",
- "raw-window-handle 0.5.2",
- "resvg",
+ "lyon_path",
+ "once_cell",
+ "raw-window-handle",
+ "rustc-hash",
  "thiserror",
+ "unicode-segmentation",
+ "xxhash-rust",
 ]
 
 [[package]]
-name = "iced_lazy"
-version = "0.6.1"
+name = "iced_renderer"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf1cb6b8cd90488d3a03fbf438ad42038cb83c81a0d61f3692c51875efdb818"
+checksum = "5c281e03001d566058f53dec9325bbe61c62da715341206d2627f57a3ecc7f69"
 dependencies = [
- "iced_native",
- "ouroboros",
+ "iced_graphics",
+ "iced_tiny_skia",
+ "iced_wgpu",
+ "log",
+ "thiserror",
 ]
 
 [[package]]
-name = "iced_native"
-version = "0.10.3"
+name = "iced_runtime"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d012eb06da490fe46a695b39721c20da9643f35cf2ecb9d30618fdeb96170616"
+checksum = "a79f852c01cc6d61663c94379cb3974ac3ad315a28c504e847d573e094f46822"
 dependencies = [
  "iced_core",
  "iced_futures",
- "iced_style",
- "num-traits",
+ "raw-window-handle",
  "thiserror",
- "twox-hash",
- "unicode-segmentation",
 ]
 
 [[package]]
 name = "iced_style"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e37333dc2991201140302cd0d4cea051bd37ca3671d5008ec85df86d232ff30"
+version = "0.12.3"
+source = "git+https://github.com/edouardparis/iced?branch=patch-0.12.3#459c8eb3da2ae21461ee56baea8a1b10d38ff6e0"
 dependencies = [
  "iced_core",
  "once_cell",
  "palette",
 ]
 
+[[package]]
+name = "iced_tiny_skia"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c2228781f4d381a1cbbd7905a9f077351aa8d37269094021d5d9e779f130aff"
+dependencies = [
+ "bytemuck",
+ "cosmic-text",
+ "iced_graphics",
+ "kurbo 0.10.4",
+ "log",
+ "resvg",
+ "rustc-hash",
+ "softbuffer",
+ "tiny-skia",
+ "xxhash-rust",
+]
+
 [[package]]
 name = "iced_wgpu"
-version = "0.10.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478803c56061f567ce5ddf223b20d11d3c118cc46bb0d0552370dc65cdc4cb9c"
+checksum = "e3c243b6700452886aac1ee1987e84d9fb43b56b53fea9a1eb67713fd0fde244"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "bytemuck",
- "encase",
  "futures",
  "glam",
- "glyph_brush",
+ "glyphon",
  "guillotiere",
  "iced_graphics",
- "iced_native",
  "log",
- "raw-window-handle 0.5.2",
+ "lyon",
+ "once_cell",
+ "resvg",
  "wgpu",
- "wgpu_glyph",
 ]
 
 [[package]]
-name = "iced_winit"
-version = "0.9.1"
+name = "iced_widget"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a59ea3a85149a6a1f9e92b6c740ce90f04e5c7d848cfd05742336863fceb955"
+checksum = "7e01b2212adecf1cb80e2267f302c0e0c263e55f97812056949199ccf9f0b908"
+dependencies = [
+ "iced_renderer",
+ "iced_runtime",
+ "iced_style",
+ "num-traits",
+ "ouroboros",
+ "qrcode",
+ "thiserror",
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "iced_winit"
+version = "0.12.3"
+source = "git+https://github.com/edouardparis/iced?branch=patch-0.12.3#459c8eb3da2ae21461ee56baea8a1b10d38ff6e0"
 dependencies = [
- "iced_futures",
  "iced_graphics",
- "iced_native",
+ "iced_runtime",
+ "iced_style",
  "log",
  "thiserror",
+ "tracing",
  "web-sys",
  "winapi",
  "window_clipboard",
@@ -2338,10 +2254,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "ident_case"
-version = "1.0.1"
+name = "icrate"
+version = "0.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319"
+dependencies = [
+ "block2",
+ "dispatch",
+ "objc2",
+]
 
 [[package]]
 name = "idna"
@@ -2374,9 +2295,9 @@ dependencies = [
 
 [[package]]
 name = "imagesize"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf"
+checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284"
 
 [[package]]
 name = "indexmap"
@@ -2414,9 +2335,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
  "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
 ]
 
 [[package]]
@@ -2425,7 +2343,7 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "hermit-abi 0.3.2",
+ "hermit-abi 0.3.9",
  "libc",
  "windows-sys 0.48.0",
 ]
@@ -2445,18 +2363,52 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
 
+[[package]]
+name = "jni"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+dependencies = [
+ "cesu8",
+ "cfg-if",
+ "combine",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
+ "windows-sys 0.45.0",
+]
+
 [[package]]
 name = "jni-sys"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
+[[package]]
+name = "jobserver"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "jpeg-decoder"
 version = "0.3.0"
@@ -2468,9 +2420,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.64"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2524,12 +2476,12 @@ dependencies = [
 
 [[package]]
 name = "khronos-egl"
-version = "4.1.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"
+checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
 dependencies = [
  "libc",
- "libloading",
+ "libloading 0.8.1",
  "pkg-config",
 ]
 
@@ -2541,20 +2493,21 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
 [[package]]
 name = "kurbo"
-version = "0.8.0"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb348d766edbac91ba1eb83020d96f4f8867924d194393083c15a51f185e6a82"
+checksum = "d676038719d1c892f91e6e85121550143c75880b42f7feff6d413a078cf91fb3"
 dependencies = [
- "arrayvec 0.5.2",
+ "arrayvec",
 ]
 
 [[package]]
 name = "kurbo"
-version = "0.9.4"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d676038719d1c892f91e6e85121550143c75880b42f7feff6d413a078cf91fb3"
+checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
+ "smallvec",
 ]
 
 [[package]]
@@ -2652,8 +2605,7 @@ dependencies = [
  "flate2",
  "hex",
  "iced",
- "iced_lazy",
- "iced_native",
+ "iced_runtime",
  "jsonrpc 0.12.1",
  "liana",
  "liana_ui",
@@ -2677,15 +2629,13 @@ dependencies = [
  "bitcoin",
  "chrono",
  "iced",
- "iced_lazy",
- "iced_native",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.141"
+version = "0.2.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
 
 [[package]]
 name = "libloading"
@@ -2697,11 +2647,32 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "libloading"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "libm"
-version = "0.2.6"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
+[[package]]
+name = "libredox"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
+dependencies = [
+ "bitflags 2.4.2",
+ "libc",
+ "redox_syscall 0.4.1",
+]
 
 [[package]]
 name = "libsqlite3-sys"
@@ -2744,16 +2715,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "linked-hash-map"
-version = "0.5.6"
+name = "linux-raw-sys"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.8"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4"
 
 [[package]]
 name = "lock_api"
@@ -2767,11 +2744,17 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+
+[[package]]
+name = "lru"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
 dependencies = [
- "cfg-if",
+ "hashbrown 0.14.0",
 ]
 
 [[package]]
@@ -2800,7 +2783,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
  "euclid",
  "num-traits",
 ]
@@ -2861,20 +2844,20 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "memmap2"
-version = "0.5.10"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
 dependencies = [
  "libc",
 ]
 
 [[package]]
-name = "memoffset"
-version = "0.6.5"
+name = "memmap2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
 dependencies = [
- "autocfg",
+ "libc",
 ]
 
 [[package]]
@@ -2897,16 +2880,17 @@ dependencies = [
 
 [[package]]
 name = "metal"
-version = "0.24.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060"
+checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "block",
  "core-graphics-types",
- "foreign-types 0.3.2",
+ "foreign-types 0.5.0",
  "log",
  "objc",
+ "paste",
 ]
 
 [[package]]
@@ -2992,15 +2976,15 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b"
 
 [[package]]
 name = "naga"
-version = "0.11.0"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5"
+checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843"
 dependencies = [
  "bit-set",
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "codespan-reporting",
  "hexf-parse",
- "indexmap 1.9.3",
+ "indexmap 2.0.0",
  "log",
  "num-traits",
  "rustc-hash",
@@ -3021,15 +3005,16 @@ dependencies = [
 
 [[package]]
 name = "ndk"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
+checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "jni-sys",
+ "log",
  "ndk-sys",
  "num_enum",
- "raw-window-handle 0.5.2",
+ "raw-window-handle",
  "thiserror",
 ]
 
@@ -3039,57 +3024,15 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
 
-[[package]]
-name = "ndk-glue"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f"
-dependencies = [
- "libc",
- "log",
- "ndk",
- "ndk-context",
- "ndk-macro",
- "ndk-sys",
- "once_cell",
- "parking_lot 0.12.1",
-]
-
-[[package]]
-name = "ndk-macro"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
-dependencies = [
- "darling",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "ndk-sys"
-version = "0.4.1+23.1.7779620"
+version = "0.5.0+25.2.9519653"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
+checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
 dependencies = [
  "jni-sys",
 ]
 
-[[package]]
-name = "nix"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf"
-dependencies = [
- "bitflags 1.3.2",
- "cc",
- "cfg-if",
- "libc",
- "memoffset 0.6.5",
-]
-
 [[package]]
 name = "nix"
 version = "0.24.3"
@@ -3099,20 +3042,6 @@ dependencies = [
  "bitflags 1.3.2",
  "cfg-if",
  "libc",
- "memoffset 0.6.5",
-]
-
-[[package]]
-name = "nix"
-version = "0.25.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
-dependencies = [
- "autocfg",
- "bitflags 1.3.2",
- "cfg-if",
- "libc",
- "memoffset 0.6.5",
 ]
 
 [[package]]
@@ -3141,7 +3070,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2473d39689a839f5a363aaef7d99f76d5611bf352286682b25a6644fec18b1d3"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
 ]
 
 [[package]]
@@ -3233,23 +3162,23 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.5.11"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
 dependencies = [
  "num_enum_derive",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.5.11"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -3273,6 +3202,28 @@ dependencies = [
  "objc_id",
 ]
 
+[[package]]
+name = "objc-sys"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60"
+
+[[package]]
+name = "objc2"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d"
+dependencies = [
+ "objc-sys",
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666"
+
 [[package]]
 name = "objc_exception"
 version = "0.1.2"
@@ -3313,12 +3264,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
-name = "ordered-float"
-version = "3.6.0"
+name = "orbclient"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13a384337e997e6860ffbaa83708b2ef329fd8c54cb67a5f64d421e0f943254f"
+checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166"
 dependencies = [
- "num-traits",
+ "libredox",
 ]
 
 [[package]]
@@ -3331,37 +3282,29 @@ dependencies = [
  "hashbrown 0.13.2",
 ]
 
-[[package]]
-name = "osmesa-sys"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b"
-dependencies = [
- "shared_library",
-]
-
 [[package]]
 name = "ouroboros"
-version = "0.13.0"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f357ef82d1b4db66fbed0b8d542cbd3c22d0bf5b393b3c257b9ba4568e70c9c3"
+checksum = "97b7be5a8a3462b752f4be3ff2b2bf2f7f1d00834902e46be2a4d68b87b0573c"
 dependencies = [
  "aliasable",
  "ouroboros_macro",
- "stable_deref_trait",
+ "static_assertions",
 ]
 
 [[package]]
 name = "ouroboros_macro"
-version = "0.13.0"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44a0b52c2cbaef7dffa5fec1a43274afe8bd2a644fa9fc50a9ef4ff0269b1257"
+checksum = "b645dcde5f119c2c454a92d0dfa271a2a3b205da92e4292a68ead4bdbfde1f33"
 dependencies = [
- "Inflector",
- "proc-macro-error",
+ "heck",
+ "itertools 0.12.1",
  "proc-macro2",
+ "proc-macro2-diagnostics",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -3376,31 +3319,30 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e25e9fb15717794fae58ab55c26e044103aad13186fbb625893f9a3bbcc24228"
 dependencies = [
- "ttf-parser",
+ "ttf-parser 0.18.1",
 ]
 
 [[package]]
 name = "palette"
-version = "0.6.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f9cd68f7112581033f157e56c77ac4a5538ec5836a2e39284e65bd7d7275e49"
+checksum = "3d38e6e5ca1612e2081cc31188f08c3cba630ce4ba44709a153f1a0f38d678f2"
 dependencies = [
  "approx",
- "num-traits",
+ "fast-srgb8",
  "palette_derive",
  "phf",
 ]
 
 [[package]]
 name = "palette_derive"
-version = "0.6.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05eedf46a8e7c27f74af0c9cfcdb004ceca158cb1b918c6f68f8d7a549b3e427"
+checksum = "e05d1c929301fee6830dafa764341118829b2535c216b0571e3821ecac5c885b"
 dependencies = [
- "find-crate",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -3451,6 +3393,12 @@ dependencies = [
  "windows-sys 0.45.0",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+
 [[package]]
 name = "percent-encoding"
 version = "2.2.0"
@@ -3575,10 +3523,25 @@ version = "0.17.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
 dependencies = [
- "bitflags 1.3.2",
- "crc32fast",
- "flate2",
- "miniz_oxide",
+ "bitflags 1.3.2",
+ "crc32fast",
+ "flate2",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "polling"
+version = "3.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi 0.3.9",
+ "pin-project-lite",
+ "rustix 0.38.34",
+ "tracing",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3610,6 +3573,12 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
+[[package]]
+name = "presser"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
+
 [[package]]
 name = "prettyplease"
 version = "0.1.25"
@@ -3630,30 +3599,6 @@ dependencies = [
  "toml_edit",
 ]
 
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
 [[package]]
 name = "proc-macro-hack"
 version = "0.5.20+deprecated"
@@ -3662,13 +3607,26 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
 dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "proc-macro2-diagnostics"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+ "version_check",
+ "yansi",
+]
+
 [[package]]
 name = "profiling"
 version = "1.0.7"
@@ -3703,7 +3661,7 @@ checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
 dependencies = [
  "bytes",
  "heck",
- "itertools",
+ "itertools 0.10.5",
  "lazy_static",
  "log",
  "multimap",
@@ -3724,7 +3682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
 dependencies = [
  "anyhow",
- "itertools",
+ "itertools 0.10.5",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -3737,10 +3695,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "065717a5dfaca4a83d2fe57db3487b311365200000551d7a364e715dbf4346bc"
 dependencies = [
  "anyhow",
- "itertools",
+ "itertools 0.10.5",
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -3763,18 +3721,24 @@ dependencies = [
 
 [[package]]
 name = "qrcode"
-version = "0.12.0"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "166f136dfdb199f98186f3649cf7a0536534a61417a1a30221b492b4fb60ce3f"
+
+[[package]]
+name = "quick-xml"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d2f1455f3630c6e5107b4f2b94e74d76dea80736de0981fd27644216cff57f"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
 dependencies = [
- "checked_int_cast",
+ "memchr",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -3816,29 +3780,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
 
 [[package]]
-name = "raw-window-handle"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76"
-dependencies = [
- "libc",
- "raw-window-handle 0.4.3",
-]
-
-[[package]]
-name = "raw-window-handle"
-version = "0.4.3"
+name = "rangemap"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41"
-dependencies = [
- "cty",
-]
+checksum = "795915a3930a5d6bafd9053d37602fea3e61be2e5d4d788983a8ba9654c1c6f2"
 
 [[package]]
 name = "raw-window-handle"
-version = "0.5.2"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
+checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b"
 
 [[package]]
 name = "rayon"
@@ -3877,6 +3828,15 @@ dependencies = [
  "rand_core",
 ]
 
+[[package]]
+name = "read-fonts"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c044ab88c43e2eae05b34a17fc13598736679fdb03d71b49fcfe114443ec8a86"
+dependencies = [
+ "font-types",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
@@ -3895,6 +3855,24 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+dependencies = [
+ "bitflags 2.4.2",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.4.3"
@@ -3925,9 +3903,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "renderdoc-sys"
-version = "0.7.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157"
+checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b"
 
 [[package]]
 name = "reqwest"
@@ -3970,9 +3948,9 @@ dependencies = [
 
 [[package]]
 name = "resvg"
-version = "0.29.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76888219c0881e22b0ceab06fddcfe83163cd81642bd60c7842387f9c968a72e"
+checksum = "cc7980f653f9a7db31acff916a262c3b78c562919263edea29bf41a056e20497"
 dependencies = [
  "gif",
  "jpeg-decoder",
@@ -3980,11 +3958,9 @@ dependencies = [
  "pico-args",
  "png",
  "rgb",
- "svgfilters",
- "svgtypes 0.10.0",
- "tiny-skia 0.8.4",
+ "svgtypes",
+ "tiny-skia",
  "usvg",
- "usvg-text-layout",
 ]
 
 [[package]]
@@ -4021,19 +3997,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "rosvgtree"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdc23d1ace03d6b8153c7d16f0708cd80b61ee8e80304954803354e67e40d150"
-dependencies = [
- "log",
- "roxmltree",
- "simplecss",
- "siphasher",
- "svgtypes 0.9.0",
-]
-
 [[package]]
 name = "roxmltree"
 version = "0.18.0"
@@ -4098,10 +4061,23 @@ dependencies = [
  "errno",
  "io-lifetimes",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.3.8",
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.4.2",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.13",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "rustls"
 version = "0.21.6"
@@ -4135,17 +4111,34 @@ dependencies = [
 
 [[package]]
 name = "rustybuzz"
-version = "0.7.0"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71cd15fef9112a1f94ac64b58d1e4628192631ad6af4dc69997f995459c874e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "bytemuck",
+ "smallvec",
+ "ttf-parser 0.19.2",
+ "unicode-bidi-mirroring",
+ "unicode-ccc",
+ "unicode-properties",
+ "unicode-script",
+]
+
+[[package]]
+name = "rustybuzz"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a"
+checksum = "2ee8fe2a8461a0854a37101fe7a1b13998d0cfa987e43248e81d2a5f4570f6fa"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
+ "libm",
  "smallvec",
- "ttf-parser",
+ "ttf-parser 0.20.0",
  "unicode-bidi-mirroring",
  "unicode-ccc",
- "unicode-general-category",
+ "unicode-properties",
  "unicode-script",
 ]
 
@@ -4156,12 +4149,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
 
 [[package]]
-name = "safe_arch"
-version = "0.5.2"
+name = "same-file"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 dependencies = [
- "bytemuck",
+ "winapi-util",
 ]
 
 [[package]]
@@ -4194,14 +4187,15 @@ dependencies = [
 
 [[package]]
 name = "sctk-adwaita"
-version = "0.4.3"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61270629cc6b4d77ec1907db1033d5c2e1a404c412743621981a871dc9c12339"
+checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550"
 dependencies = [
- "crossfont",
+ "ab_glyph",
  "log",
+ "memmap2 0.9.4",
  "smithay-client-toolkit",
- "tiny-skia 0.7.0",
+ "tiny-skia",
 ]
 
 [[package]]
@@ -4238,6 +4232,12 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "self_cell"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba"
+
 [[package]]
 name = "semver"
 version = "1.0.18"
@@ -4261,7 +4261,7 @@ checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -4304,27 +4304,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "servo-fontconfig"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c"
-dependencies = [
- "libc",
- "servo-fontconfig-sys",
-]
-
-[[package]]
-name = "servo-fontconfig-sys"
-version = "5.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388"
-dependencies = [
- "expat-sys",
- "freetype-sys",
- "pkg-config",
-]
-
 [[package]]
 name = "sha2"
 version = "0.10.8"
@@ -4345,16 +4324,6 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "shared_library"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
-dependencies = [
- "lazy_static",
- "libc",
-]
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.1"
@@ -4421,31 +4390,47 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
 
 [[package]]
 name = "smithay-client-toolkit"
-version = "0.16.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454"
+checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "calloop",
- "dlib",
- "lazy_static",
+ "calloop-wayland-source",
+ "cursor-icon",
+ "libc",
  "log",
- "memmap2",
- "nix 0.24.3",
- "pkg-config",
+ "memmap2 0.9.4",
+ "rustix 0.38.34",
+ "thiserror",
+ "wayland-backend",
  "wayland-client",
+ "wayland-csd-frame",
  "wayland-cursor",
  "wayland-protocols",
+ "wayland-protocols-wlr",
+ "wayland-scanner",
+ "xkeysym",
 ]
 
 [[package]]
 name = "smithay-clipboard"
-version = "0.6.6"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8"
+checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d"
 dependencies = [
+ "libc",
  "smithay-client-toolkit",
- "wayland-client",
+ "wayland-backend",
+]
+
+[[package]]
+name = "smol_str"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49"
+dependencies = [
+ "serde",
 ]
 
 [[package]]
@@ -4480,6 +4465,37 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "softbuffer"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61d5d17f23326fe0d9b0af282f73f3af666699420fd5f42629efd9c6e7dc166f"
+dependencies = [
+ "as-raw-xcb-connection",
+ "bytemuck",
+ "cfg_aliases 0.2.0",
+ "cocoa",
+ "core-graphics",
+ "drm",
+ "fastrand 2.1.0",
+ "foreign-types 0.5.0",
+ "js-sys",
+ "log",
+ "memmap2 0.9.4",
+ "objc",
+ "raw-window-handle",
+ "redox_syscall 0.5.1",
+ "rustix 0.38.34",
+ "tiny-xlib",
+ "wasm-bindgen",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-sys",
+ "web-sys",
+ "windows-sys 0.52.0",
+ "x11rb",
+]
+
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -4497,12 +4513,11 @@ dependencies = [
 
 [[package]]
 name = "spirv"
-version = "0.2.0+1.5.4"
+version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
+checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 1.3.2",
- "num-traits",
+ "bitflags 2.4.2",
 ]
 
 [[package]]
@@ -4515,39 +4530,21 @@ dependencies = [
  "der",
 ]
 
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "str-buf"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
-
 [[package]]
 name = "strict-num"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9df65f20698aeed245efdde3628a6b559ea1239bbb871af1b6e3b58c413b2bd1"
+checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
 dependencies = [
  "float-cmp",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "subtle"
 version = "2.4.1"
@@ -4560,34 +4557,25 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
 
-[[package]]
-name = "svgfilters"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "639abcebc15fdc2df179f37d6f5463d660c1c79cd552c12343a4600827a04bce"
-dependencies = [
- "float-cmp",
- "rgb",
-]
-
 [[package]]
 name = "svgtypes"
-version = "0.9.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9ee29c1407a5b18ccfe5f6ac82ac11bab3b14407e09c209a6c1a32098b19734"
+checksum = "d71499ff2d42f59d26edb21369a308ede691421f79ebc0f001e2b1fd3a7c9e52"
 dependencies = [
- "kurbo 0.8.0",
+ "kurbo 0.9.4",
  "siphasher",
 ]
 
 [[package]]
-name = "svgtypes"
-version = "0.10.0"
+name = "swash"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98ffacedcdcf1da6579c907279b4f3c5492fbce99fbbf227f5ed270a589c2765"
+checksum = "d06ff4664af8923625604261c645f5c4cc610cc83c84bec74b50d76237089de7"
 dependencies = [
- "kurbo 0.9.4",
- "siphasher",
+ "read-fonts",
+ "yazi",
+ "zeno",
 ]
 
 [[package]]
@@ -4603,15 +4591,24 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.43"
+version = "2.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53"
+checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "sys-locale"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "tar"
 version = "0.4.40"
@@ -4630,39 +4627,39 @@ checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
 dependencies = [
  "autocfg",
  "cfg-if",
- "fastrand",
+ "fastrand 1.9.0",
  "redox_syscall 0.3.5",
- "rustix",
+ "rustix 0.37.13",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.2.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -4708,52 +4705,40 @@ dependencies = [
 
 [[package]]
 name = "tiny-skia"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642680569bb895b16e4b9d181c60be1ed136fa0c9c7f11d004daf053ba89bf82"
-dependencies = [
- "arrayref",
- "arrayvec 0.5.2",
- "bytemuck",
- "cfg-if",
- "png",
- "safe_arch",
- "tiny-skia-path 0.7.0",
-]
-
-[[package]]
-name = "tiny-skia"
-version = "0.8.4"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67"
+checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec",
  "bytemuck",
  "cfg-if",
+ "log",
  "png",
- "tiny-skia-path 0.8.4",
+ "tiny-skia-path",
 ]
 
 [[package]]
 name = "tiny-skia-path"
-version = "0.7.0"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c114d32f0c2ee43d585367cb013dfaba967ab9f62b90d9af0d696e955e70fa6c"
+checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
 dependencies = [
  "arrayref",
  "bytemuck",
+ "strict-num",
 ]
 
 [[package]]
-name = "tiny-skia-path"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c"
-dependencies = [
- "arrayref",
- "bytemuck",
- "strict-num",
+name = "tiny-xlib"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d"
+dependencies = [
+ "as-raw-xcb-connection",
+ "ctor",
+ "libloading 0.8.1",
+ "tracing",
 ]
 
 [[package]]
@@ -4797,7 +4782,7 @@ checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -4940,15 +4925,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633"
 
 [[package]]
-name = "twox-hash"
-version = "1.6.3"
+name = "ttf-parser"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
-dependencies = [
- "cfg-if",
- "rand",
- "static_assertions",
-]
+checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1"
+
+[[package]]
+name = "ttf-parser"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
 
 [[package]]
 name = "typenum"
@@ -4974,18 +4960,18 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1"
 
-[[package]]
-name = "unicode-general-category"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
 
+[[package]]
+name = "unicode-linebreak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
+
 [[package]]
 name = "unicode-normalization"
 version = "0.1.22"
@@ -4995,6 +4981,12 @@ dependencies = [
  "tinyvec",
 ]
 
+[[package]]
+name = "unicode-properties"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291"
+
 [[package]]
 name = "unicode-script"
 version = "0.5.5"
@@ -5054,35 +5046,63 @@ dependencies = [
 
 [[package]]
 name = "usvg"
-version = "0.29.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63b6bb4e62619d9f68aa2d8a823fea2bff302340a1f2d45c264d5b0be170832e"
+checksum = "c51daa774fe9ee5efcf7b4fec13019b8119cda764d9a8b5b06df02bb1445c656"
 dependencies = [
  "base64 0.21.6",
+ "log",
+ "pico-args",
+ "usvg-parser",
+ "usvg-text-layout",
+ "usvg-tree",
+ "xmlwriter",
+]
+
+[[package]]
+name = "usvg-parser"
+version = "0.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45c88a5ffaa338f0e978ecf3d4e00d8f9f493e29bed0752e1a808a1db16afc40"
+dependencies = [
  "data-url",
  "flate2",
  "imagesize",
  "kurbo 0.9.4",
  "log",
- "rctree",
- "rosvgtree",
- "strict-num",
+ "roxmltree",
+ "simplecss",
+ "siphasher",
+ "svgtypes",
+ "usvg-tree",
 ]
 
 [[package]]
 name = "usvg-text-layout"
-version = "0.29.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "195386e01bc35f860db024de275a76e7a31afdf975d18beb6d0e44764118b4db"
+checksum = "4d2374378cb7a3fb8f33894e0fdb8625e1bbc4f25312db8d91f862130b541593"
 dependencies = [
  "fontdb",
  "kurbo 0.9.4",
  "log",
- "rustybuzz",
+ "rustybuzz 0.10.0",
  "unicode-bidi",
  "unicode-script",
  "unicode-vo",
- "usvg",
+ "usvg-tree",
+]
+
+[[package]]
+name = "usvg-tree"
+version = "0.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6cacb0c5edeaf3e80e5afcf5b0d4004cc1d36318befc9a7c6606507e5d0f4062"
+dependencies = [
+ "rctree",
+ "strict-num",
+ "svgtypes",
+ "tiny-skia-path",
 ]
 
 [[package]]
@@ -5097,18 +5117,22 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
 [[package]]
 name = "want"
 version = "0.3.1"
@@ -5132,9 +5156,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.87"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -5142,24 +5166,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.87"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.60",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.37"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5169,9 +5193,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.87"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5179,22 +5203,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.87"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.60",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.87"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasm-timer"
@@ -5212,93 +5236,129 @@ dependencies = [
 ]
 
 [[package]]
-name = "wayland-client"
-version = "0.29.5"
+name = "wayland-backend"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715"
+checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40"
 dependencies = [
- "bitflags 1.3.2",
+ "cc",
  "downcast-rs",
- "libc",
- "nix 0.24.3",
+ "rustix 0.38.34",
  "scoped-tls",
- "wayland-commons",
- "wayland-scanner",
+ "smallvec",
  "wayland-sys",
 ]
 
 [[package]]
-name = "wayland-commons"
-version = "0.29.5"
+name = "wayland-client"
+version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902"
+checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f"
 dependencies = [
- "nix 0.24.3",
- "once_cell",
- "smallvec",
- "wayland-sys",
+ "bitflags 2.4.2",
+ "rustix 0.38.34",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-csd-frame"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
+dependencies = [
+ "bitflags 2.4.2",
+ "cursor-icon",
+ "wayland-backend",
 ]
 
 [[package]]
 name = "wayland-cursor"
-version = "0.29.5"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661"
+checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba"
 dependencies = [
- "nix 0.24.3",
+ "rustix 0.38.34",
  "wayland-client",
  "xcursor",
 ]
 
 [[package]]
-name = "wayland-egl"
-version = "0.29.5"
+name = "wayland-protocols"
+version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402de949f81a012926d821a2d659f930694257e76dd92b6e0042ceb27be4107d"
+checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
 dependencies = [
+ "bitflags 2.4.2",
+ "wayland-backend",
  "wayland-client",
- "wayland-sys",
+ "wayland-scanner",
 ]
 
 [[package]]
-name = "wayland-protocols"
-version = "0.29.5"
+name = "wayland-protocols-plasma"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6"
+checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-wlr"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
+dependencies = [
+ "bitflags 2.4.2",
+ "wayland-backend",
  "wayland-client",
- "wayland-commons",
+ "wayland-protocols",
  "wayland-scanner",
 ]
 
 [[package]]
 name = "wayland-scanner"
-version = "0.29.5"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53"
+checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283"
 dependencies = [
  "proc-macro2",
+ "quick-xml",
  "quote",
- "xml-rs",
 ]
 
 [[package]]
 name = "wayland-sys"
-version = "0.29.5"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4"
+checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af"
 dependencies = [
  "dlib",
- "lazy_static",
+ "log",
+ "once_cell",
  "pkg-config",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.61"
+version = "0.3.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5318,18 +5378,19 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
 
 [[package]]
 name = "wgpu"
-version = "0.15.1"
+version = "0.19.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7"
+checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
  "cfg-if",
+ "cfg_aliases 0.1.1",
  "js-sys",
  "log",
  "naga",
  "parking_lot 0.12.1",
  "profiling",
- "raw-window-handle 0.5.2",
+ "raw-window-handle",
  "smallvec",
  "static_assertions",
  "wasm-bindgen",
@@ -5342,20 +5403,23 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.15.1"
+version = "0.19.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff"
+checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
  "bit-vec",
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
+ "cfg_aliases 0.1.1",
  "codespan-reporting",
- "fxhash",
+ "indexmap 2.0.0",
  "log",
  "naga",
+ "once_cell",
  "parking_lot 0.12.1",
  "profiling",
- "raw-window-handle 0.5.2",
+ "raw-window-handle",
+ "rustc-hash",
  "smallvec",
  "thiserror",
  "web-sys",
@@ -5365,21 +5429,21 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.15.4"
+version = "0.19.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b"
+checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3"
 dependencies = [
  "android_system_properties",
- "arrayvec 0.7.4",
+ "arrayvec",
  "ash",
  "bit-set",
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "block",
+ "cfg_aliases 0.1.1",
  "core-graphics-types",
  "d3d12",
- "foreign-types 0.3.2",
- "fxhash",
- "glow 0.12.1",
+ "glow",
+ "glutin_wgl_sys",
  "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
@@ -5387,16 +5451,19 @@ dependencies = [
  "js-sys",
  "khronos-egl",
  "libc",
- "libloading",
+ "libloading 0.8.1",
  "log",
  "metal",
  "naga",
+ "ndk-sys",
  "objc",
+ "once_cell",
  "parking_lot 0.12.1",
  "profiling",
  "range-alloc",
- "raw-window-handle 0.5.2",
+ "raw-window-handle",
  "renderdoc-sys",
+ "rustc-hash",
  "smallvec",
  "thiserror",
  "wasm-bindgen",
@@ -5407,27 +5474,15 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "0.15.2"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110"
+checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.2",
  "js-sys",
  "web-sys",
 ]
 
-[[package]]
-name = "wgpu_glyph"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e25440d5f32ec39de49c57c15c2d3f9133a7939b069b5ad07e5afd8b78fb8adc"
-dependencies = [
- "bytemuck",
- "glyph_brush",
- "log",
- "wgpu",
-]
-
 [[package]]
 name = "which"
 version = "4.4.0"
@@ -5441,9 +5496,9 @@ dependencies = [
 
 [[package]]
 name = "widestring"
-version = "0.5.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
 
 [[package]]
 name = "winapi"
@@ -5470,15 +5525,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "winapi-wsapoll"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -5487,47 +5533,44 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "window_clipboard"
-version = "0.2.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "015dd4474dc6aa96fe19aae3a24587a088bd90331dba5a5cc60fb3a180234c4d"
+checksum = "f6d692d46038c433f9daee7ad8757e002a4248c20b0a3fbc991d99521d3bcb6d"
 dependencies = [
  "clipboard-win",
  "clipboard_macos",
  "clipboard_wayland",
  "clipboard_x11",
- "raw-window-handle 0.3.4",
+ "raw-window-handle",
  "thiserror",
 ]
 
 [[package]]
 name = "windows"
-version = "0.44.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
 dependencies = [
- "windows-targets 0.42.2",
+ "windows-targets 0.48.0",
 ]
 
 [[package]]
 name = "windows"
-version = "0.48.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
- "windows-targets 0.48.0",
+ "windows-core",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.36.1"
+name = "windows-core"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -5548,6 +5591,15 @@ dependencies = [
  "windows-targets 0.48.0",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -5578,6 +5630,22 @@ dependencies = [
  "windows_x86_64_msvc 0.48.0",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -5591,10 +5659,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
 [[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -5609,10 +5677,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
 [[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
+name = "windows_aarch64_msvc"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -5627,10 +5695,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
 [[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
+name = "windows_i686_gnu"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -5645,10 +5719,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
 [[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
+name = "windows_i686_msvc"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -5662,6 +5736,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -5675,10 +5755,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
 [[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -5692,37 +5772,58 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
 [[package]]
 name = "winit"
-version = "0.27.5"
+version = "0.29.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c"
+checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca"
 dependencies = [
- "bitflags 1.3.2",
- "cocoa",
+ "ahash 0.8.11",
+ "android-activity",
+ "atomic-waker",
+ "bitflags 2.4.2",
+ "bytemuck",
+ "calloop",
+ "cfg_aliases 0.1.1",
  "core-foundation",
  "core-graphics",
- "dispatch",
- "instant",
+ "cursor-icon",
+ "icrate",
+ "js-sys",
  "libc",
  "log",
- "mio",
+ "memmap2 0.9.4",
  "ndk",
- "ndk-glue",
- "objc",
+ "ndk-sys",
+ "objc2",
  "once_cell",
- "parking_lot 0.12.1",
+ "orbclient",
  "percent-encoding",
- "raw-window-handle 0.4.3",
- "raw-window-handle 0.5.2",
+ "raw-window-handle",
+ "redox_syscall 0.3.5",
+ "rustix 0.38.34",
  "sctk-adwaita",
  "smithay-client-toolkit",
+ "smol_str",
+ "unicode-segmentation",
  "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wayland-backend",
  "wayland-client",
  "wayland-protocols",
+ "wayland-protocols-plasma",
  "web-sys",
- "windows-sys 0.36.1",
+ "web-time",
+ "windows-sys 0.48.0",
  "x11-dl",
+ "x11rb",
+ "xkbcommon-dl",
 ]
 
 [[package]]
@@ -5744,15 +5845,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "wio"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "x11-dl"
 version = "2.21.0"
@@ -5766,16 +5858,25 @@ dependencies = [
 
 [[package]]
 name = "x11rb"
-version = "0.9.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e99be55648b3ae2a52342f9a870c0e138709a3493261ce9b469afe6e4df6d8a"
+checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12"
 dependencies = [
+ "as-raw-xcb-connection",
  "gethostname",
- "nix 0.22.3",
- "winapi",
- "winapi-wsapoll",
+ "libc",
+ "libloading 0.8.1",
+ "once_cell",
+ "rustix 0.38.34",
+ "x11rb-protocol",
 ]
 
+[[package]]
+name = "x11rb-protocol"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
@@ -5797,10 +5898,23 @@ dependencies = [
 ]
 
 [[package]]
-name = "xi-unicode"
-version = "0.3.0"
+name = "xkbcommon-dl"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
+dependencies = [
+ "bitflags 2.4.2",
+ "dlib",
+ "log",
+ "once_cell",
+ "xkeysym",
+]
+
+[[package]]
+name = "xkeysym"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
+checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621"
 
 [[package]]
 name = "xml-rs"
@@ -5814,6 +5928,36 @@ version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd"
 
+[[package]]
+name = "xmlwriter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
+
+[[package]]
+name = "xxhash-rust"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03"
+
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
+[[package]]
+name = "yazi"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1"
+
+[[package]]
+name = "zeno"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697"
+
 [[package]]
 name = "zerocopy"
 version = "0.7.32"
@@ -5831,7 +5975,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -5851,7 +5995,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.43",
+ "syn 2.0.60",
 ]
 
 [[package]]
diff --git a/gui/Cargo.toml b/gui/Cargo.toml
index 9229176da..54c26469a 100644
--- a/gui/Cargo.toml
+++ b/gui/Cargo.toml
@@ -21,9 +21,8 @@ liana_ui = { path = "ui" }
 backtrace = "0.3"
 hex = "0.4.3"
 
-iced = { version = "0.9", default-features= false, features = ["tokio", "glow", "svg", "qr_code", "image"] }
-iced_native = "0.10"
-iced_lazy = { version = "0.6"}
+iced = { version = "0.12.1", default-features = false, features = ["tokio", "svg", "qr_code", "image", "lazy", "wgpu"] }
+iced_runtime = "0.12.1"
 
 tokio = {version = "1.21.0", features = ["signal"]}
 serde = { version = "1.0", features = ["derive"] }
@@ -48,8 +47,11 @@ bitcoin_hashes = "0.12"
 reqwest = { version = "0.11", default-features=false, features = ["rustls-tls"] }
 rust-ini = "0.19.0"
 
+
 [patch.crates-io]
-iced_futures = { git = "https://github.com/edouardparis/iced", branch = "fix-futures-recipe"}
+iced_style = { git = "https://github.com/edouardparis/iced", branch = "patch-0.12.3"}
+iced_winit = { git = "https://github.com/edouardparis/iced", branch = "patch-0.12.3"}
+iced_futures = { git = "https://github.com/edouardparis/iced", branch = "patch-0.12.3"}
 
 [target.'cfg(windows)'.dependencies]
 zip = { version = "0.6", default-features=false, features = ["bzip2", "deflate"] }
diff --git a/gui/shell.nix b/gui/shell.nix
index 2c19d6617..a9963822c 100644
--- a/gui/shell.nix
+++ b/gui/shell.nix
@@ -9,7 +9,7 @@ let
    pkgs = import <nixpkgs> {};
 in
 pkgs.mkShell rec {
-  buildInputs = [
+  buildInputs = with pkgs; [
     pkgs.expat
     pkgs.fontconfig
     pkgs.freetype
@@ -17,6 +17,8 @@ pkgs.mkShell rec {
     pkgs.libGL
     pkgs.pkgconfig
     pkgs.udev
+    pkgs.wayland
+    pkgs.libxkbcommon
     pkgs.xorg.libX11
     pkgs.xorg.libXcursor
     pkgs.xorg.libXi
diff --git a/gui/src/app/state/receive.rs b/gui/src/app/state/receive.rs
index 4387937d1..17ef1780c 100644
--- a/gui/src/app/state/receive.rs
+++ b/gui/src/app/state/receive.rs
@@ -302,13 +302,13 @@ impl VerifyAddressModal {
 }
 
 pub struct ShowQrCodeModal {
-    qr_code: qr_code::State,
+    qr_code: qr_code::Data,
     address: String,
 }
 
 impl ShowQrCodeModal {
     pub fn new(address: &Address, index: ChildNumber) -> Option<Self> {
-        qr_code::State::new(format!("bitcoin:{}?index={}", address, index))
+        qr_code::Data::new(format!("bitcoin:{}?index={}", address, index))
             .ok()
             .map(|qr_code| Self {
                 qr_code,
diff --git a/gui/src/app/view/coins.rs b/gui/src/app/view/coins.rs
index c4ef42091..797b66330 100644
--- a/gui/src/app/view/coins.rs
+++ b/gui/src/app/view/coins.rs
@@ -6,7 +6,6 @@ use liana_ui::{
     color,
     component::{amount::*, badge, button, form, text::*},
     icon, theme,
-    util::Collection,
     widget::*,
 };
 
diff --git a/gui/src/app/view/home.rs b/gui/src/app/view/home.rs
index 14bd9bc89..7714aa704 100644
--- a/gui/src/app/view/home.rs
+++ b/gui/src/app/view/home.rs
@@ -8,7 +8,6 @@ use liana_ui::{
     color,
     component::{amount::*, button, card, event, form, text::*},
     icon, theme,
-    util::Collection,
     widget::*,
 };
 
diff --git a/gui/src/app/view/mod.rs b/gui/src/app/view/mod.rs
index e760f58b0..181e7b5ac 100644
--- a/gui/src/app/view/mod.rs
+++ b/gui/src/app/view/mod.rs
@@ -29,7 +29,6 @@ use liana_ui::{
     },
     image::*,
     theme,
-    util::Collection,
     widget::*,
 };
 
diff --git a/gui/src/app/view/psbt.rs b/gui/src/app/view/psbt.rs
index 4b5378cff..5cb6bbe2f 100644
--- a/gui/src/app/view/psbt.rs
+++ b/gui/src/app/view/psbt.rs
@@ -23,7 +23,6 @@ use liana_ui::{
         text::{self, *},
     },
     icon, theme,
-    util::Collection,
     widget::*,
 };
 
@@ -426,7 +425,7 @@ pub fn signatures<'a>(
                                             Container::new(text(alias))
                                                 .padding(10)
                                                 .style(theme::Container::Pill(theme::Pill::Simple)),
-                                            value.to_string(),
+                                            liana_ui::widget::Text::new(value.to_string()),
                                             tooltip::Position::Bottom,
                                         )
                                         .style(theme::Container::Card(theme::Card::Simple)),
@@ -439,7 +438,9 @@ pub fn signatures<'a>(
                             },
                         )),
                 )
-                .horizontal_scroll(scrollable::Properties::new().width(2).scroller_width(2)),
+                .direction(scrollable::Direction::Horizontal(
+                    scrollable::Properties::new().width(2).scroller_width(2),
+                )),
             )
             .padding(15)
         } else {
@@ -520,7 +521,7 @@ fn container_from_fg(
                 Container::new(text(alias))
                     .padding(10)
                     .style(theme::Container::Pill(theme::Pill::Simple)),
-                fg.to_string(),
+                liana_ui::widget::Text::new(fg.to_string()),
                 tooltip::Position::Bottom,
             )
             .style(theme::Container::Card(theme::Card::Simple)),
@@ -594,7 +595,9 @@ pub fn path_view<'a>(
             )
             .push(row_signed),
     )
-    .horizontal_scroll(scrollable::Properties::new().width(2).scroller_width(2))
+    .direction(scrollable::Direction::Horizontal(
+        scrollable::Properties::new().width(2).scroller_width(2),
+    ))
     .into()
 }
 
diff --git a/gui/src/app/view/psbts.rs b/gui/src/app/view/psbts.rs
index 3bc28d8bb..dc06c406a 100644
--- a/gui/src/app/view/psbts.rs
+++ b/gui/src/app/view/psbts.rs
@@ -4,7 +4,6 @@ use liana_ui::{
     color,
     component::{amount::*, badge, button, card, form, text::*},
     icon, theme,
-    util::Collection,
     widget::*,
 };
 
diff --git a/gui/src/app/view/receive.rs b/gui/src/app/view/receive.rs
index 03a8e3c26..45d582d67 100644
--- a/gui/src/app/view/receive.rs
+++ b/gui/src/app/view/receive.rs
@@ -3,11 +3,10 @@ use std::collections::{HashMap, HashSet};
 use iced::{
     widget::{
         qr_code::{self, QRCode},
-        scrollable,
+        scrollable, Space,
     },
     Alignment, Length,
 };
-use iced_native::widget::Space;
 
 use liana::miniscript::bitcoin::{
     self,
@@ -22,7 +21,6 @@ use liana_ui::{
         text::{self, *},
     },
     icon, theme,
-    util::Collection,
     widget::*,
 };
 
@@ -94,10 +92,11 @@ pub fn receive<'a>(
                                                                 Length::Fixed(10.0),
                                                             )),
                                                     )
-                                                    .horizontal_scroll(
+                                                    .direction(scrollable::Direction::Horizontal(
                                                         scrollable::Properties::new()
-                                                            .scroller_width(5),
-                                                    ),
+                                                            .width(2)
+                                                            .scroller_width(2),
+                                                    )),
                                                 )
                                                 .width(Length::Fill),
                                             )
@@ -216,13 +215,13 @@ pub fn verify_address_modal<'a>(
         .into()
 }
 
-pub fn qr_modal<'a>(qr: &'a qr_code::State, address: &'a String) -> Element<'a, Message> {
+pub fn qr_modal<'a>(qr: &'a qr_code::Data, address: &'a String) -> Element<'a, Message> {
     Column::new()
         .push(
             Row::new()
                 .push(Space::with_width(Length::Fill))
                 .push(
-                    Container::new(QRCode::new(qr).cell_size(8))
+                    Container::new(QRCode::<liana_ui::theme::Theme>::new(qr).cell_size(8))
                         .padding(10)
                         .style(theme::Container::QrCode),
                 )
diff --git a/gui/src/app/view/recovery.rs b/gui/src/app/view/recovery.rs
index 52e435c25..6a5f39f21 100644
--- a/gui/src/app/view/recovery.rs
+++ b/gui/src/app/view/recovery.rs
@@ -13,7 +13,6 @@ use liana::miniscript::bitcoin::{
 use liana_ui::{
     component::{amount::*, button, form, text::*},
     icon, theme,
-    util::*,
     widget::*,
 };
 
@@ -144,9 +143,10 @@ pub fn recovery_path_view<'a>(
     selected: bool,
 ) -> Element<'a, Message> {
     Row::new()
-        .push(checkbox("", selected, move |_| {
-            Message::CreateSpend(CreateSpendMessage::SelectPath(index))
-        }))
+        .push(
+            checkbox("", selected)
+                .on_toggle(move |_| Message::CreateSpend(CreateSpendMessage::SelectPath(index))),
+        )
         .push(
             Column::new()
                 .push(
@@ -170,7 +170,7 @@ pub fn recovery_path_view<'a>(
                                             Container::new(text(alias))
                                                 .padding(5)
                                                 .style(theme::Container::Pill(theme::Pill::Simple)),
-                                            fg.to_string(),
+                                            liana_ui::widget::Text::new(fg.to_string()),
                                             tooltip::Position::Bottom,
                                         )
                                         .style(theme::Container::Card(theme::Card::Simple)),
diff --git a/gui/src/app/view/settings.rs b/gui/src/app/view/settings.rs
index e5390e46e..6c5583b61 100644
--- a/gui/src/app/view/settings.rs
+++ b/gui/src/app/view/settings.rs
@@ -18,7 +18,6 @@ use liana_ui::{
     color,
     component::{badge, button, card, form, separation, text::*, tooltip::tooltip},
     icon, theme,
-    util::Collection,
     widget::*,
 };
 
@@ -633,9 +632,9 @@ pub fn wallet_settings<'a>(
                                 .push(text(descriptor.to_owned()).small())
                                 .push(Space::with_height(Length::Fixed(5.0))),
                         )
-                        .horizontal_scroll(
+                        .direction(scrollable::Direction::Horizontal(
                             scrollable::Properties::new().width(5).scroller_width(5),
-                        ),
+                        )),
                     )
                     .push(
                         Row::new()
diff --git a/gui/src/app/view/spend/mod.rs b/gui/src/app/view/spend/mod.rs
index 3dcfafae2..e760ed68f 100644
--- a/gui/src/app/view/spend/mod.rs
+++ b/gui/src/app/view/spend/mod.rs
@@ -15,7 +15,6 @@ use liana_ui::{
     color,
     component::{amount::*, badge, button, form, text::*},
     icon, theme,
-    util::Collection,
     widget::*,
 };
 
@@ -405,9 +404,8 @@ pub fn recipient_view<'a>(
                         None
                     })
                     .push(tooltip::Tooltip::new(
-                        checkbox("MAX", is_max_selected, move |_| {
-                            CreateSpendMessage::SendMaxToRecipient(index)
-                        }),
+                        checkbox("MAX", is_max_selected)
+                            .on_toggle(move |_| CreateSpendMessage::SendMaxToRecipient(index)),
                         // Add spaces at end so that text is padded at screen edge.
                         "Total amount remaining after paying fee and any other recipients     ",
                         tooltip::Position::Bottom,
@@ -431,9 +429,11 @@ fn coin_list_view<'a>(
     Row::new()
         .push(
             Row::new()
-                .push(checkbox("", selected, move |_| {
-                    Message::CreateSpend(CreateSpendMessage::SelectCoin(i))
-                }))
+                .push(
+                    checkbox("", selected).on_toggle(move |_| {
+                        Message::CreateSpend(CreateSpendMessage::SelectCoin(i))
+                    }),
+                )
                 .push(
                     if let Some(label) = coins_labels.get(&coin.outpoint.to_string()) {
                         Container::new(p1_regular(label)).width(Length::Fill)
diff --git a/gui/src/app/view/transactions.rs b/gui/src/app/view/transactions.rs
index 86c75b52d..cab1064ca 100644
--- a/gui/src/app/view/transactions.rs
+++ b/gui/src/app/view/transactions.rs
@@ -7,7 +7,6 @@ use liana_ui::{
     color,
     component::{amount::*, badge, button, card, form, text::*},
     icon, theme,
-    util::Collection,
     widget::*,
 };
 
diff --git a/gui/src/installer/step/descriptor.rs b/gui/src/installer/step/descriptor.rs
index 960f596e7..c5167d055 100644
--- a/gui/src/installer/step/descriptor.rs
+++ b/gui/src/installer/step/descriptor.rs
@@ -1626,7 +1626,7 @@ impl From<BackupDescriptor> for Box<dyn Step> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use iced_native::command::Action;
+    use iced_runtime::command::Action;
     use std::sync::{Arc, Mutex};
 
     pub struct Sandbox<S: Step> {
diff --git a/gui/src/installer/view.rs b/gui/src/installer/view.rs
index 290a36eca..34070f2e3 100644
--- a/gui/src/installer/view.rs
+++ b/gui/src/installer/view.rs
@@ -18,7 +18,6 @@ use liana_ui::{
         tooltip,
     },
     icon, image, theme,
-    util::Collection,
     widget::*,
 };
 
@@ -319,7 +318,9 @@ pub fn define_descriptor<'a>(
                             )
                             .padding(5),
                     )
-                    .horizontal_scroll(Properties::new().width(3).scroller_width(3)),
+                    .direction(scrollable::Direction::Horizontal(
+                        Properties::new().width(3).scroller_width(3),
+                    )),
                 ),
         ))
         .spacing(10);
@@ -436,7 +437,9 @@ pub fn recovery_path_view(
                                 )
                                 .padding(5),
                         )
-                        .horizontal_scroll(Properties::new().width(3).scroller_width(3)),
+                        .direction(scrollable::Direction::Horizontal(
+                            Properties::new().width(3).scroller_width(3),
+                        )),
                     ),
             ),
     )
@@ -568,9 +571,9 @@ pub fn signer_xpubs(xpubs: &[String]) -> Element<Message> {
                             .push(
                                 Container::new(
                                     scrollable(Container::new(text(xpub).small()).padding(10))
-                                        .horizontal_scroll(
+                                        .direction(scrollable::Direction::Horizontal(
                                             Properties::new().width(5).scroller_width(5),
-                                        ),
+                                        )),
                                 )
                                 .width(Length::Fill),
                             )
@@ -641,9 +644,9 @@ pub fn hardware_wallet_xpubs<'a>(
                             .push(
                                 Container::new(
                                     scrollable(Container::new(text(xpub).small()).padding(10))
-                                        .horizontal_scroll(
+                                        .direction(scrollable::Direction::Horizontal(
                                             Properties::new().width(5).scroller_width(5),
-                                        ),
+                                        )),
                                 )
                                 .width(Length::Fill),
                             )
@@ -716,11 +719,10 @@ pub fn participate_xpub<'a>(
                     .push(signer)
                     .width(Length::Fill),
             )
-            .push(checkbox(
-                "I have shared my extended public key",
-                shared,
-                Message::UserActionDone,
-            ))
+            .push(
+                checkbox("I have shared my extended public key", shared)
+                    .on_toggle(Message::UserActionDone),
+            )
             .push(if shared && network_valid {
                 button::primary(None, "Next")
                     .width(Length::Fixed(200.0))
@@ -756,7 +758,16 @@ pub fn register_descriptor<'a>(
             .push(card::simple(
                 Column::new()
                     .push(text("The descriptor:").small().bold())
-                    .push(text(descriptor.clone()).small())
+                    .push(
+                        scrollable(
+                            Column::new()
+                                .push(text(descriptor.to_owned()).small())
+                                .push(Space::with_height(Length::Fixed(5.0))),
+                        )
+                        .direction(scrollable::Direction::Horizontal(
+                            scrollable::Properties::new().width(5).scroller_width(5),
+                        )),
+                    )
                     .push(
                         Row::new().push(Column::new().width(Length::Fill)).push(
                             button::secondary(Some(icon::clipboard_icon()), "Copy")
@@ -803,8 +814,7 @@ pub fn register_descriptor<'a>(
             .push_maybe(created_desc.then_some(checkbox(
                 "I have registered the descriptor on my device(s)",
                 done,
-                Message::UserActionDone,
-            )))
+            ).on_toggle(Message::UserActionDone)))
             .push(if !created_desc || (done && !processing) {
                 button::primary(None, "Next")
                     .on_press(Message::Next)
@@ -858,7 +868,16 @@ pub fn backup_descriptor<'a>(
             .push(card::simple(
                 Column::new()
                     .push(text("The descriptor:").small().bold())
-                    .push(text(descriptor.clone()).small())
+                    .push(
+                        scrollable(
+                            Column::new()
+                                .push(text(descriptor.to_owned()).small())
+                                .push(Space::with_height(Length::Fixed(5.0))),
+                        )
+                        .direction(scrollable::Direction::Horizontal(
+                            scrollable::Properties::new().width(5).scroller_width(5),
+                        )),
+                    )
                     .push(
                         Row::new().push(Column::new().width(Length::Fill)).push(
                             button::secondary(Some(icon::clipboard_icon()), "Copy")
@@ -868,11 +887,9 @@ pub fn backup_descriptor<'a>(
                     .spacing(10)
                     .max_width(1000),
             ))
-            .push(checkbox(
-                "I have backed up my descriptor",
-                done,
-                Message::UserActionDone,
-            ))
+            .push(
+                checkbox("I have backed up my descriptor", done).on_toggle(Message::UserActionDone),
+            )
             .push(if done {
                 button::primary(None, "Next")
                     .on_press(Message::Next)
@@ -1401,7 +1418,9 @@ pub fn defined_descriptor_key<'a>(
                                 .push(text(name).bold())
                                 .push(Space::with_height(Length::Fixed(5.0))),
                         )
-                        .horizontal_scroll(Properties::new().width(5).scroller_width(5)),
+                        .direction(scrollable::Direction::Horizontal(
+                            Properties::new().width(5).scroller_width(5),
+                        )),
                     )
                     .push(image::success_mark_icon().width(Length::Fixed(50.0)))
                     .push(Space::with_width(Length::Fixed(1.0))),
@@ -1672,7 +1691,7 @@ pub fn edit_sequence_modal<'a>(sequence: &form::Value<String>) -> Element<'a, Me
                                 message::SequenceModal::SequenceEdited(v.to_string()),
                             ))
                         })
-                        .step(144), // 144 blocks per day
+                        .step(144_u16), // 144 blocks per day
                     )
                     .width(Length::Fixed(500.0)),
                 );
@@ -1815,11 +1834,7 @@ pub fn backup_mnemonic<'a>(
                         )
                     }),
             )
-            .push(checkbox(
-                "I have backed up my mnemonic",
-                done,
-                Message::UserActionDone,
-            ))
+            .push(checkbox("I have backed up my mnemonic", done).on_toggle(Message::UserActionDone))
             .push(if done {
                 button::primary(None, "Next")
                     .on_press(Message::Next)
@@ -1997,8 +2012,8 @@ fn layout<'a>(
 
 mod threshsold_input {
     use iced::alignment::{self, Alignment};
+    use iced::widget::{component, Component};
     use iced::Length;
-    use iced_lazy::{self, Component};
     use liana_ui::{component::text::*, icon, theme, widget::*};
 
     pub struct ThresholdInput<Message> {
@@ -2035,7 +2050,7 @@ mod threshsold_input {
         }
     }
 
-    impl<Message> Component<Message, iced::Renderer<theme::Theme>> for ThresholdInput<Message> {
+    impl<Message> Component<Message, theme::Theme> for ThresholdInput<Message> {
         type State = ();
         type Event = Event;
 
@@ -2085,7 +2100,7 @@ mod threshsold_input {
         Message: 'a,
     {
         fn from(numeric_input: ThresholdInput<Message>) -> Self {
-            iced_lazy::component(numeric_input)
+            component(numeric_input)
         }
     }
 }
diff --git a/gui/src/launcher.rs b/gui/src/launcher.rs
index 032d719b9..f2dc329d1 100644
--- a/gui/src/launcher.rs
+++ b/gui/src/launcher.rs
@@ -1,6 +1,7 @@
 use std::path::PathBuf;
 
 use iced::{
+    alignment::Horizontal,
     widget::{tooltip, Space},
     Alignment, Command, Length, Subscription,
 };
@@ -10,7 +11,6 @@ use liana_ui::{
     color,
     component::{badge, button, card, modal::Modal, notification, text::*},
     icon, image, theme,
-    util::*,
     widget::*,
 };
 
@@ -330,7 +330,7 @@ impl DeleteWalletModal {
                                 .push(icon::circle_check_icon().style(color::GREEN))
                                 .push(text("Wallet successfully deleted").style(color::GREEN))
                         })
-                        .align_x(iced_native::alignment::Horizontal::Center)
+                        .align_x(Horizontal::Center)
                         .width(Length::Fill),
                     ),
             )
diff --git a/gui/src/loader.rs b/gui/src/loader.rs
index 8efcd107a..db221b59e 100644
--- a/gui/src/loader.rs
+++ b/gui/src/loader.rs
@@ -19,7 +19,6 @@ use liana_ui::{
     color,
     component::{button, notification, text::*},
     icon,
-    util::Collection,
     widget::*,
 };
 
diff --git a/gui/src/logger.rs b/gui/src/logger.rs
index 66ef12ca5..9366c0309 100644
--- a/gui/src/logger.rs
+++ b/gui/src/logger.rs
@@ -64,6 +64,7 @@ impl Logger {
                             && !metadata.target().starts_with("iced_glow")
                             && !metadata.target().starts_with("glow_glyph")
                             && !metadata.target().starts_with("naga")
+                            && !metadata.target().starts_with("winit")
                             && !metadata.target().starts_with("mio")
                             && !metadata.target().starts_with("ledger_transport_hid")
                     })),
diff --git a/gui/src/main.rs b/gui/src/main.rs
index 0b90ceec6..84a2b7120 100644
--- a/gui/src/main.rs
+++ b/gui/src/main.rs
@@ -5,9 +5,9 @@ use std::{error::Error, io::Write, path::PathBuf, process, str::FromStr};
 use iced::{
     event::{self, Event},
     executor,
-    keyboard::{self, KeyCode},
-    subscription,
+    keyboard::{self},
     widget::{focus_next, focus_previous},
+    window::settings::PlatformSpecific,
     Application, Command, Settings, Subscription,
 };
 use tracing::{error, info};
@@ -90,12 +90,19 @@ pub enum Key {
 #[derive(Debug)]
 pub enum Message {
     CtrlC,
+    FontLoaded(Result<(), iced::font::Error>),
     Launch(Box<launcher::Message>),
     Install(Box<installer::Message>),
     Load(Box<loader::Message>),
     Run(Box<app::Message>),
-    Event(iced_native::Event),
     KeyPressed(Key),
+    Event(iced::Event),
+}
+
+impl From<Result<(), iced::font::Error>> for Message {
+    fn from(value: Result<(), iced::font::Error>) -> Self {
+        Self::FontLoaded(value)
+    }
 }
 
 async fn ctrl_c() -> Result<(), ()> {
@@ -121,17 +128,12 @@ impl Application for GUI {
 
     fn new((config, log_level): (Config, Option<LevelFilter>)) -> (GUI, Command<Self::Message>) {
         let logger = Logger::setup(log_level.unwrap_or(LevelFilter::INFO));
-        match config {
+        let mut cmds = font::loads();
+        cmds.push(Command::perform(ctrl_c(), |_| Message::CtrlC));
+        let state = match config {
             Config::Launcher(datadir_path) => {
                 let launcher = Launcher::new(datadir_path);
-                (
-                    Self {
-                        state: State::Launcher(Box::new(launcher)),
-                        logger,
-                        log_level,
-                    },
-                    Command::perform(ctrl_c(), |_| Message::CtrlC),
-                )
+                State::Launcher(Box::new(launcher))
             }
             Config::Install(datadir_path, network) => {
                 if !datadir_path.exists() {
@@ -151,17 +153,8 @@ impl Application for GUI {
                     log_level.unwrap_or(LevelFilter::INFO),
                 );
                 let (install, command) = Installer::new(datadir_path, network);
-                (
-                    Self {
-                        state: State::Installer(Box::new(install)),
-                        logger,
-                        log_level,
-                    },
-                    Command::batch(vec![
-                        command.map(|msg| Message::Install(Box::new(msg))),
-                        Command::perform(ctrl_c(), |_| Message::CtrlC),
-                    ]),
-                )
+                cmds.push(command.map(|msg| Message::Install(Box::new(msg))));
+                State::Installer(Box::new(install))
             }
             Config::Run(datadir_path, cfg, network) => {
                 logger.set_running_mode(
@@ -170,37 +163,31 @@ impl Application for GUI {
                     log_level.unwrap_or_else(|| cfg.log_level().unwrap_or(LevelFilter::INFO)),
                 );
                 let (loader, command) = Loader::new(datadir_path, cfg, network, None);
-                (
-                    Self {
-                        state: State::Loader(Box::new(loader)),
-                        logger,
-                        log_level,
-                    },
-                    Command::batch(vec![
-                        command.map(|msg| Message::Load(Box::new(msg))),
-                        Command::perform(ctrl_c(), |_| Message::CtrlC),
-                    ]),
-                )
+                cmds.push(command.map(|msg| Message::Load(Box::new(msg))));
+                State::Loader(Box::new(loader))
             }
-        }
+        };
+        (
+            Self {
+                state,
+                logger,
+                log_level,
+            },
+            Command::batch(cmds),
+        )
     }
 
     fn update(&mut self, message: Self::Message) -> Command<Self::Message> {
         match (&mut self.state, message) {
             (_, Message::CtrlC)
-            | (
-                _,
-                Message::Event(iced_native::Event::Window(
-                    iced_native::window::Event::CloseRequested,
-                )),
-            ) => {
+            | (_, Message::Event(iced::Event::Window(_, iced::window::Event::CloseRequested))) => {
                 match &mut self.state {
                     State::Loader(s) => s.stop(),
                     State::Launcher(s) => s.stop(),
                     State::Installer(s) => s.stop(),
                     State::App(s) => s.stop(),
                 };
-                iced::window::close()
+                iced::window::close(iced::window::Id::MAIN)
             }
             (_, Message::KeyPressed(Key::Tab(shift))) => {
                 log::debug!("Tab pressed!");
@@ -299,26 +286,26 @@ impl Application for GUI {
                 State::App(v) => v.subscription().map(|msg| Message::Run(Box::new(msg))),
                 State::Launcher(v) => v.subscription().map(|msg| Message::Launch(Box::new(msg))),
             },
-            subscription::events_with(|event, status| match (&event, status) {
+            iced::event::listen_with(|event, status| match (&event, status) {
                 (
                     Event::Keyboard(keyboard::Event::KeyPressed {
-                        key_code: KeyCode::Tab,
+                        key: iced::keyboard::Key::Named(iced::keyboard::key::Named::Tab),
                         modifiers,
                         ..
                     }),
                     event::Status::Ignored,
                 ) => Some(Message::KeyPressed(Key::Tab(modifiers.shift()))),
                 (
-                    iced::Event::Window(iced_native::window::Event::CloseRequested),
+                    iced::Event::Window(_, iced::window::Event::CloseRequested),
                     event::Status::Ignored,
                 ) => Some(Message::Event(event)),
                 _ => None,
             }),
         ])
-        .with_filter(|(event, _status)| {
+        .with_filter(|event| {
             matches!(
                 event,
-                iced::Event::Window(iced_native::window::Event::CloseRequested)
+                iced::Event::Window(_, iced::window::Event::CloseRequested)
                     | iced::Event::Keyboard(_)
             )
         })
@@ -453,11 +440,19 @@ fn main() -> Result<(), Box<dyn Error>> {
     setup_panic_hook();
 
     let mut settings = Settings::with_flags((config, log_level));
-    settings.id = Some("liana-gui".to_string());
     settings.window.icon = Some(image::liana_app_icon());
     settings.default_text_size = text::P1_SIZE.into();
-    settings.default_font = Some(font::REGULAR_BYTES);
-    settings.exit_on_close_request = false;
+    settings.default_font = liana_ui::font::REGULAR;
+    settings.window.exit_on_close_request = false;
+
+    settings.id = Some("Liana".to_string());
+
+    #[cfg(target_os = "linux")]
+    {
+        settings.window.platform_specific = PlatformSpecific {
+            application_id: "Liana".to_string(),
+        };
+    }
 
     if let Err(e) = GUI::run(settings) {
         return Err(format!("Failed to launch UI: {}", e).into());
diff --git a/gui/src/utils/sandbox.rs b/gui/src/utils/sandbox.rs
index d37f775ae..4fe9c6254 100644
--- a/gui/src/utils/sandbox.rs
+++ b/gui/src/utils/sandbox.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use iced_native::command::Action;
+use iced_runtime::command::Action;
 
 use crate::{
     app::{cache::Cache, message::Message, state::State, wallet::Wallet},
diff --git a/gui/ui/Cargo.toml b/gui/ui/Cargo.toml
index 60bcd4066..badfe0ebe 100644
--- a/gui/ui/Cargo.toml
+++ b/gui/ui/Cargo.toml
@@ -6,8 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-iced = { version = "0.9", default_features = false, features = ["svg", "image", "glow"] }
-iced_native = "0.10"
-iced_lazy = { version = "0.6"}
+iced = { version = "0.12.1", default-features = false, features = ["svg", "image", "lazy", "qr_code", "advanced", "webgl"] }
 bitcoin = "0.31"
 chrono = "0.4"
diff --git a/gui/ui/examples/design-system/Cargo.toml b/gui/ui/examples/design-system/Cargo.toml
index 8f6232da7..0c645a43f 100644
--- a/gui/ui/examples/design-system/Cargo.toml
+++ b/gui/ui/examples/design-system/Cargo.toml
@@ -6,8 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-iced = "0.9"
-iced_native = "0.10"
+iced = "0.10"
 web-sys = "0.3.61"
 chrono = "0.4"
 liana_ui = { path = "../.." }
diff --git a/gui/ui/examples/design-system/src/main.rs b/gui/ui/examples/design-system/src/main.rs
index 696bfdb32..87f0d23c4 100644
--- a/gui/ui/examples/design-system/src/main.rs
+++ b/gui/ui/examples/design-system/src/main.rs
@@ -2,11 +2,12 @@ mod section;
 
 use iced::widget::{button, column, container, row, scrollable, text, Space};
 use iced::{executor, Application, Command, Length, Settings, Subscription};
-use liana_ui::{component::text::*, image, theme, widget::*};
+use liana_ui::{component::text::*, font, image, theme, widget::*};
 
 pub fn main() -> iced::Result {
     let mut settings = Settings::with_flags(Config {});
     settings.default_text_size = P1_SIZE.into();
+    settings.default_font = font::REGULAR;
     DesignSystem::run(settings)
 }
 
@@ -21,11 +22,18 @@ struct DesignSystem {
 
 #[derive(Debug, Clone)]
 pub enum Message {
-    Event(iced_native::Event),
+    FontLoaded(Result<(), iced::font::Error>),
+    Event(iced::Event),
     Section(usize),
     Ignore,
 }
 
+impl From<Result<(), iced::font::Error>> for Message {
+    fn from(res: Result<(), iced::font::Error>) -> Message {
+        Message::FontLoaded(res)
+    }
+}
+
 impl Application for DesignSystem {
     type Message = Message;
     type Theme = theme::Theme;
@@ -49,6 +57,9 @@ impl Application for DesignSystem {
             ],
             current: 0,
         };
+        #[allow(unused_mut)]
+        let mut cmds: Vec<Command<Self::Message>> = font::loads();
+
         #[cfg(target_arch = "wasm32")]
         {
             use iced_native::{command, window};
@@ -57,16 +68,12 @@ impl Application for DesignSystem {
                 (window.inner_width().unwrap().as_f64().unwrap()) as u32,
                 (window.inner_height().unwrap().as_f64().unwrap()) as u32,
             );
-            (
-                app,
-                Command::single(command::Action::Window(window::Action::Resize {
-                    width,
-                    height,
-                })),
-            )
+            cmds.push(Command::single(command::Action::Window(
+                window::Action::Resize { width, height },
+            )));
         }
-        #[cfg(not(target_arch = "wasm32"))]
-        (app, Command::none())
+
+        (app, Command::batch(cmds))
     }
 
     fn update(&mut self, message: Message) -> Command<Self::Message> {
@@ -76,10 +83,7 @@ impl Application for DesignSystem {
                     self.current = i;
                 }
             }
-            Message::Event(iced::Event::Window(iced_native::window::Event::Resized {
-                width,
-                height,
-            })) => {
+            Message::Event(iced::Event::Window(iced::window::Event::Resized { width, height })) => {
                 #[cfg(target_arch = "wasm32")]
                 {
                     use iced_native::{command, window};
@@ -95,7 +99,7 @@ impl Application for DesignSystem {
     }
 
     fn subscription(&self) -> Subscription<Self::Message> {
-        iced_native::subscription::events().map(Self::Message::Event)
+        iced::subscription::events().map(Self::Message::Event)
     }
 
     fn view(&self) -> Element<Message> {
diff --git a/gui/ui/src/component/amount.rs b/gui/ui/src/component/amount.rs
index 1c780e8d7..172a13636 100644
--- a/gui/ui/src/component/amount.rs
+++ b/gui/ui/src/component/amount.rs
@@ -1,6 +1,6 @@
 pub use bitcoin::Amount;
 
-use crate::{color, component::text::*, util::Collection, widget::*};
+use crate::{color, component::text::*, widget::*};
 
 pub fn amount<'a, T: 'a>(a: &Amount) -> Row<'a, T> {
     amount_with_size(a, P1_SIZE)
diff --git a/gui/ui/src/component/badge.rs b/gui/ui/src/component/badge.rs
index 502489a7e..1ef6c4476 100644
--- a/gui/ui/src/component/badge.rs
+++ b/gui/ui/src/component/badge.rs
@@ -108,7 +108,6 @@ pub fn badge_pill<'a, T: 'a>(label: &'a str, tooltip: &'a str) -> Container<'a,
         tooltip::Tooltip::new(
             Container::new(text::p2_regular(label))
                 .padding(10)
-                .width(Length::Fill)
                 .center_x()
                 .style(theme::Container::Pill(theme::Pill::Simple)),
             tooltip,
diff --git a/gui/ui/src/component/button.rs b/gui/ui/src/component/button.rs
index 21a1528a7..bf2663049 100644
--- a/gui/ui/src/component/button.rs
+++ b/gui/ui/src/component/button.rs
@@ -1,19 +1,28 @@
 use crate::{color, theme, widget::*};
 use iced::widget::{button, container, row};
-use iced::{Alignment, Length};
+use iced::Alignment;
 
 use super::text::text;
 
 pub fn menu<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Button<'a, T> {
-    button::Button::new(content(icon.map(|i| i.style(color::GREY_3)), t).padding(10))
+    button::Button::new(content_menu(icon.map(|i| i.style(color::GREY_3)), t).padding(10))
         .style(theme::Button::Menu(false))
 }
 
 pub fn menu_active<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Button<'a, T> {
-    button::Button::new(content(icon.map(|i| i.style(color::GREY_3)), t).padding(10))
+    button::Button::new(content_menu(icon.map(|i| i.style(color::GREY_3)), t).padding(10))
         .style(theme::Button::Menu(true))
 }
 
+fn content_menu<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Container<'a, T> {
+    match icon {
+        None => container(text(t)).padding(5),
+        Some(i) => {
+            container(row![i, text(t)].spacing(10).align_items(Alignment::Center)).padding(5)
+        }
+    }
+}
+
 pub fn alert<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Button<'a, T> {
     button::Button::new(content(icon, t)).style(theme::Button::Destructive)
 }
@@ -40,15 +49,9 @@ pub fn transparent_border<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) ->
 
 fn content<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Container<'a, T> {
     match icon {
-        None => container(text(t)).width(Length::Fill).center_x().padding(5),
-        Some(i) => container(
-            row![i, text(t)]
-                .spacing(10)
-                .width(iced::Length::Fill)
-                .align_items(Alignment::Center),
-        )
-        .width(iced::Length::Fill)
-        .center_x()
-        .padding(5),
+        None => container(text(t)).center_x().padding(5),
+        Some(i) => container(row![i, text(t)].spacing(10).align_items(Alignment::Center))
+            .center_x()
+            .padding(5),
     }
 }
diff --git a/gui/ui/src/component/card.rs b/gui/ui/src/component/card.rs
index 7b6e85004..d15b7b82d 100644
--- a/gui/ui/src/component/card.rs
+++ b/gui/ui/src/component/card.rs
@@ -34,7 +34,7 @@ pub fn error<'a, T: 'a>(message: &'static str, error: String) -> Container<'a, T
                 .align_items(iced::Alignment::Center)
                 .push(icon::warning_icon().style(color::RED))
                 .push(text(message).style(color::RED)),
-            error,
+            Text::new(error),
             iced::widget::tooltip::Position::Bottom,
         )
         .style(theme::Container::Card(theme::Card::Error)),
diff --git a/gui/ui/src/component/collapse.rs b/gui/ui/src/component/collapse.rs
index 154ebcaaf..9fff50363 100644
--- a/gui/ui/src/component/collapse.rs
+++ b/gui/ui/src/component/collapse.rs
@@ -1,6 +1,8 @@
-use crate::widget::*;
-use iced::widget::column;
-use iced_lazy::{self, Component};
+use iced::{
+    advanced,
+    widget::{column, component, Button, Component},
+    Element,
+};
 use std::marker::PhantomData;
 
 pub struct Collapse<'a, M, H, F, C> {
@@ -10,13 +12,15 @@ pub struct Collapse<'a, M, H, F, C> {
     phantom: PhantomData<&'a M>,
 }
 
-impl<'a, Message, T, H, F, C> Collapse<'a, Message, H, F, C>
+impl<'a, Message, T, H, F, C, Theme, Renderer> Collapse<'a, Message, H, F, C>
 where
+    Renderer: advanced::Renderer,
+    Theme: iced::widget::button::StyleSheet,
     Message: 'a,
     T: Into<Message> + Clone + 'a,
-    H: Fn() -> Button<'a, Event<T>> + 'a,
-    F: Fn() -> Button<'a, Event<T>> + 'a,
-    C: Fn() -> Element<'a, T> + 'a,
+    H: Fn() -> Button<'a, Event<T>, Theme, Renderer> + 'a,
+    F: Fn() -> Button<'a, Event<T>, Theme, Renderer> + 'a,
+    C: Fn() -> Element<'a, T, Theme, Renderer> + 'a,
 {
     pub fn new(before: H, after: F, content: C) -> Self {
         Collapse {
@@ -34,13 +38,15 @@ pub enum Event<T> {
     Collapse(bool),
 }
 
-impl<'a, Message, T, H, F, C> Component<Message, iced::Renderer<crate::theme::Theme>>
+impl<'a, Message, T, H, F, C, Theme, Renderer> Component<Message, Theme, Renderer>
     for Collapse<'a, Message, H, F, C>
 where
     T: Into<Message> + Clone + 'a,
-    H: Fn() -> Button<'a, Event<T>>,
-    F: Fn() -> Button<'a, Event<T>>,
-    C: Fn() -> Element<'a, T>,
+    H: Fn() -> Button<'a, Event<T>, Theme, Renderer>,
+    F: Fn() -> Button<'a, Event<T>, Theme, Renderer>,
+    C: Fn() -> Element<'a, T, Theme, Renderer>,
+    Renderer: 'a + advanced::Renderer,
+    Theme: 'a + iced::widget::button::StyleSheet,
 {
     type State = bool;
     type Event = Event<T>;
@@ -55,7 +61,7 @@ where
         }
     }
 
-    fn view(&self, state: &Self::State) -> Element<Self::Event> {
+    fn view(&self, state: &Self::State) -> Element<Self::Event, Theme, Renderer> {
         if *state {
             column![
                 (self.after)().on_press(Event::Collapse(false)),
@@ -68,16 +74,18 @@ where
     }
 }
 
-impl<'a, Message, T, H: 'a, F: 'a, C: 'a> From<Collapse<'a, Message, H, F, C>>
-    for Element<'a, Message>
+impl<'a, Message, T, H: 'a, F: 'a, C: 'a, Theme, Renderer> From<Collapse<'a, Message, H, F, C>>
+    for Element<'a, Message, Theme, Renderer>
 where
     Message: 'a,
+    Renderer: 'a + advanced::Renderer,
+    Theme: 'a + iced::widget::button::StyleSheet,
     T: Into<Message> + Clone + 'a,
-    H: Fn() -> Button<'a, Event<T>>,
-    F: Fn() -> Button<'a, Event<T>>,
-    C: Fn() -> Element<'a, T>,
+    H: Fn() -> Button<'a, Event<T>, Theme, Renderer>,
+    F: Fn() -> Button<'a, Event<T>, Theme, Renderer>,
+    C: Fn() -> Element<'a, T, Theme, Renderer>,
 {
     fn from(c: Collapse<'a, Message, H, F, C>) -> Self {
-        iced_lazy::component(c)
+        component(c)
     }
 }
diff --git a/gui/ui/src/component/event.rs b/gui/ui/src/component/event.rs
index 2544996ec..1ee629954 100644
--- a/gui/ui/src/component/event.rs
+++ b/gui/ui/src/component/event.rs
@@ -2,7 +2,6 @@ use crate::{
     color,
     component::{amount, badge, text},
     theme,
-    util::Collection,
     widget::*,
 };
 use bitcoin::Amount;
@@ -12,7 +11,7 @@ use iced::{
 };
 
 pub fn unconfirmed_outgoing_event<'a, T: Clone + 'a>(
-    label: Option<iced::widget::Text<'a, iced::Renderer<theme::Theme>>>,
+    label: Option<Text<'a>>,
     amount: &Amount,
     msg: T,
 ) -> Container<'a, T> {
@@ -39,7 +38,7 @@ pub fn unconfirmed_outgoing_event<'a, T: Clone + 'a>(
 }
 
 pub fn confirmed_outgoing_event<'a, T: Clone + 'a>(
-    label: Option<iced::widget::Text<'a, iced::Renderer<theme::Theme>>>,
+    label: Option<Text<'a>>,
     date: chrono::NaiveDateTime,
     amount: &Amount,
     msg: T,
@@ -72,7 +71,7 @@ pub fn confirmed_outgoing_event<'a, T: Clone + 'a>(
 }
 
 pub fn unconfirmed_incoming_event<'a, T: Clone + 'a>(
-    label: Option<iced::widget::Text<'a, iced::Renderer<theme::Theme>>>,
+    label: Option<Text<'a>>,
     amount: &Amount,
     msg: T,
 ) -> Container<'a, T> {
@@ -99,7 +98,7 @@ pub fn unconfirmed_incoming_event<'a, T: Clone + 'a>(
 }
 
 pub fn confirmed_incoming_event<'a, T: Clone + 'a>(
-    label: Option<iced::widget::Text<'a, iced::Renderer<theme::Theme>>>,
+    label: Option<Text<'a>>,
     date: chrono::NaiveDateTime,
     amount: &Amount,
     msg: T,
diff --git a/gui/ui/src/component/form.rs b/gui/ui/src/component/form.rs
index 1ff274c5a..b2017be0a 100644
--- a/gui/ui/src/component/form.rs
+++ b/gui/ui/src/component/form.rs
@@ -1,7 +1,7 @@
 use bitcoin::Denomination;
 use iced::{widget::text_input, Length};
 
-use crate::{color, component::text, theme, util::Collection, widget::*};
+use crate::{color, component::text, theme, widget::*};
 
 #[derive(Debug, Clone)]
 pub struct Value<T> {
@@ -19,7 +19,7 @@ impl std::default::Default for Value<String> {
 }
 
 pub struct Form<'a, Message> {
-    input: text_input::TextInput<'a, Message, iced::Renderer<theme::Theme>>,
+    input: TextInput<'a, Message>,
     warning: Option<&'a str>,
     valid: bool,
 }
diff --git a/gui/ui/src/component/hw.rs b/gui/ui/src/component/hw.rs
index 534d4872f..d2b9978ea 100644
--- a/gui/ui/src/component/hw.rs
+++ b/gui/ui/src/component/hw.rs
@@ -1,4 +1,4 @@
-use crate::{color, component::text, icon, image, theme, util::*, widget::*};
+use crate::{color, component::text, icon, image, theme, widget::*};
 use iced::{
     widget::{column, container, row, tooltip},
     Alignment, Length,
diff --git a/gui/ui/src/component/modal.rs b/gui/ui/src/component/modal.rs
index 261bf8193..cb0b823e4 100644
--- a/gui/ui/src/component/modal.rs
+++ b/gui/ui/src/component/modal.rs
@@ -1,23 +1,26 @@
 /// modal widget from https://github.com/iced-rs/iced/blob/master/examples/modal/
-use iced_native::alignment::Alignment;
-use iced_native::widget::{self, Tree};
-use iced_native::{
-    event, layout, mouse, overlay, renderer, Clipboard, Color, Element, Event, Layout, Length,
-    Point, Rectangle, Shell, Size, Widget,
-};
+use iced::advanced::layout::{self, Layout};
+use iced::advanced::overlay;
+use iced::advanced::renderer;
+use iced::advanced::widget::{self, Tree, Widget};
+use iced::advanced::{self, Clipboard, Shell};
+use iced::alignment::Alignment;
+use iced::event;
+use iced::mouse;
+use iced::{Color, Element, Event, Length, Point, Rectangle, Size, Vector};
 
 /// A widget that centers a modal element over some base element
-pub struct Modal<'a, Message, Renderer> {
-    base: Element<'a, Message, Renderer>,
-    modal: Element<'a, Message, Renderer>,
+pub struct Modal<'a, Message, Theme, Renderer> {
+    base: Element<'a, Message, Theme, Renderer>,
+    modal: Element<'a, Message, Theme, Renderer>,
     on_blur: Option<Message>,
 }
 
-impl<'a, Message, Renderer> Modal<'a, Message, Renderer> {
+impl<'a, Message, Theme, Renderer> Modal<'a, Message, Theme, Renderer> {
     /// Returns a new [`Modal`]
     pub fn new(
-        base: impl Into<Element<'a, Message, Renderer>>,
-        modal: impl Into<Element<'a, Message, Renderer>>,
+        base: impl Into<Element<'a, Message, Theme, Renderer>>,
+        modal: impl Into<Element<'a, Message, Theme, Renderer>>,
     ) -> Self {
         Self {
             base: base.into(),
@@ -33,9 +36,10 @@ impl<'a, Message, Renderer> Modal<'a, Message, Renderer> {
     }
 }
 
-impl<'a, Message, Renderer> Widget<Message, Renderer> for Modal<'a, Message, Renderer>
+impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
+    for Modal<'a, Message, Theme, Renderer>
 where
-    Renderer: iced_native::Renderer,
+    Renderer: advanced::Renderer,
     Message: Clone,
 {
     fn children(&self) -> Vec<Tree> {
@@ -46,47 +50,52 @@ where
         tree.diff_children(&[&self.base, &self.modal]);
     }
 
-    fn width(&self) -> Length {
-        self.base.as_widget().width()
+    fn size(&self) -> Size<Length> {
+        self.base.as_widget().size()
     }
 
-    fn height(&self) -> Length {
-        self.base.as_widget().height()
-    }
-
-    fn layout(&self, renderer: &Renderer, limits: &layout::Limits) -> layout::Node {
-        self.base.as_widget().layout(renderer, limits)
+    fn layout(
+        &self,
+        tree: &mut widget::Tree,
+        renderer: &Renderer,
+        limits: &layout::Limits,
+    ) -> layout::Node {
+        self.base
+            .as_widget()
+            .layout(&mut tree.children[0], renderer, limits)
     }
 
     fn on_event(
         &mut self,
-        state: &mut Tree,
+        state: &mut widget::Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
+        viewport: &Rectangle,
     ) -> event::Status {
         self.base.as_widget_mut().on_event(
             &mut state.children[0],
             event,
             layout,
-            cursor_position,
+            cursor,
             renderer,
             clipboard,
             shell,
+            viewport,
         )
     }
 
     fn draw(
         &self,
-        state: &Tree,
+        state: &widget::Tree,
         renderer: &mut Renderer,
-        theme: &<Renderer as iced_native::Renderer>::Theme,
+        theme: &Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
         self.base.as_widget().draw(
@@ -95,7 +104,7 @@ where
             theme,
             style,
             layout,
-            cursor_position,
+            cursor,
             viewport,
         );
     }
@@ -105,30 +114,29 @@ where
         state: &'b mut Tree,
         layout: Layout<'_>,
         _renderer: &Renderer,
-    ) -> Option<overlay::Element<'b, Message, Renderer>> {
-        Some(overlay::Element::new(
-            layout.position(),
-            Box::new(Overlay {
-                content: &mut self.modal,
-                tree: &mut state.children[1],
-                size: layout.bounds().size(),
-                on_blur: self.on_blur.clone(),
-            }),
-        ))
+        translation: Vector,
+    ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
+        Some(overlay::Element::new(Box::new(Overlay {
+            position: layout.position() + translation,
+            content: &mut self.modal,
+            tree: &mut state.children[1],
+            size: layout.bounds().size(),
+            on_blur: self.on_blur.clone(),
+        })))
     }
 
     fn mouse_interaction(
         &self,
-        state: &Tree,
+        state: &widget::Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
         self.base.as_widget().mouse_interaction(
             &state.children[0],
             layout,
-            cursor_position,
+            cursor,
             viewport,
             renderer,
         )
@@ -147,38 +155,39 @@ where
     }
 }
 
-struct Overlay<'a, 'b, Message, Renderer> {
-    content: &'b mut Element<'a, Message, Renderer>,
+struct Overlay<'a, 'b, Message, Theme, Renderer> {
+    position: Point,
+    content: &'b mut Element<'a, Message, Theme, Renderer>,
     tree: &'b mut Tree,
     size: Size,
     on_blur: Option<Message>,
 }
 
-impl<'a, 'b, Message, Renderer> overlay::Overlay<Message, Renderer>
-    for Overlay<'a, 'b, Message, Renderer>
+impl<'a, 'b, Message, Theme, Renderer> overlay::Overlay<Message, Theme, Renderer>
+    for Overlay<'a, 'b, Message, Theme, Renderer>
 where
-    Renderer: iced_native::Renderer,
+    Renderer: advanced::Renderer,
     Message: Clone,
 {
-    fn layout(&self, renderer: &Renderer, _bounds: Size, position: Point) -> layout::Node {
+    fn layout(&mut self, renderer: &Renderer, _bounds: Size) -> layout::Node {
         let limits = layout::Limits::new(Size::ZERO, self.size)
             .width(Length::Fill)
             .height(Length::Fill);
 
-        let mut child = self.content.as_widget().layout(renderer, &limits);
-        child.align(Alignment::Center, Alignment::Center, limits.max());
-
-        let mut node = layout::Node::with_children(self.size, vec![child]);
-        node.move_to(position);
+        let child = self
+            .content
+            .as_widget()
+            .layout(self.tree, renderer, &limits)
+            .align(Alignment::Center, Alignment::Center, limits.max());
 
-        node
+        layout::Node::with_children(self.size, vec![child]).move_to(self.position)
     }
 
     fn on_event(
         &mut self,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
@@ -187,7 +196,7 @@ where
 
         if let Some(message) = self.on_blur.as_ref() {
             if let Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) = &event {
-                if !content_bounds.contains(cursor_position) {
+                if !cursor.is_over(content_bounds) {
                     shell.publish(message.clone());
                     return event::Status::Captured;
                 }
@@ -198,27 +207,26 @@ where
             self.tree,
             event,
             layout.children().next().unwrap(),
-            cursor_position,
+            cursor,
             renderer,
             clipboard,
             shell,
+            &layout.bounds(),
         )
     }
 
     fn draw(
         &self,
         renderer: &mut Renderer,
-        theme: &Renderer::Theme,
+        theme: &Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
     ) {
         renderer.fill_quad(
             renderer::Quad {
                 bounds: layout.bounds(),
-                border_radius: renderer::BorderRadius::from(0.0),
-                border_width: 0.0,
-                border_color: Color::TRANSPARENT,
+                ..renderer::Quad::default()
             },
             Color {
                 a: 0.80,
@@ -232,7 +240,7 @@ where
             theme,
             style,
             layout.children().next().unwrap(),
-            cursor_position,
+            cursor,
             &layout.bounds(),
         );
     }
@@ -254,26 +262,41 @@ where
     fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor: mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
         self.content.as_widget().mouse_interaction(
             self.tree,
             layout.children().next().unwrap(),
-            cursor_position,
+            cursor,
             viewport,
             renderer,
         )
     }
+
+    fn overlay<'c>(
+        &'c mut self,
+        layout: Layout<'_>,
+        renderer: &Renderer,
+    ) -> Option<overlay::Element<'c, Message, Theme, Renderer>> {
+        self.content.as_widget_mut().overlay(
+            self.tree,
+            layout.children().next().unwrap(),
+            renderer,
+            Vector::ZERO,
+        )
+    }
 }
 
-impl<'a, Message, Renderer> From<Modal<'a, Message, Renderer>> for Element<'a, Message, Renderer>
+impl<'a, Message, Theme, Renderer> From<Modal<'a, Message, Theme, Renderer>>
+    for Element<'a, Message, Theme, Renderer>
 where
-    Renderer: 'a + iced_native::Renderer,
+    Renderer: 'a + advanced::Renderer,
     Message: 'a + Clone,
+    Theme: 'a,
 {
-    fn from(modal: Modal<'a, Message, Renderer>) -> Self {
+    fn from(modal: Modal<'a, Message, Theme, Renderer>) -> Self {
         Element::new(modal)
     }
 }
diff --git a/gui/ui/src/component/notification.rs b/gui/ui/src/component/notification.rs
index ed6b57942..dff32e87e 100644
--- a/gui/ui/src/component/notification.rs
+++ b/gui/ui/src/component/notification.rs
@@ -5,7 +5,6 @@ use crate::{
     color,
     component::{collapse, text},
     icon, theme,
-    util::*,
     widget::*,
 };
 use iced::{
diff --git a/gui/ui/src/component/text.rs b/gui/ui/src/component/text.rs
index 7fe714795..f51fc719d 100644
--- a/gui/ui/src/component/text.rs
+++ b/gui/ui/src/component/text.rs
@@ -1,122 +1,94 @@
 use crate::{font, theme::Theme};
 use std::borrow::Cow;
 
-// 40 * 1.2
-pub const H1_SIZE: u16 = 48;
-// 29 * 1.2
-pub const H2_SIZE: u16 = 35;
-// 24 * 1.2
-pub const H3_SIZE: u16 = 29;
-// 20 * 1.2
-pub const H4_SIZE: u16 = 24;
-// 18 * 1.2
-pub const H5_SIZE: u16 = 22;
-// 16 * 1.2
-pub const P1_SIZE: u16 = 20;
-// 14 * 1.2
-pub const P2_SIZE: u16 = 17;
-// 12 * 1.2
-pub const CAPTION_SIZE: u16 = 15;
-
-pub fn h1<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, iced::Renderer<Theme>> {
+pub const H1_SIZE: u16 = 40;
+pub const H2_SIZE: u16 = 29;
+pub const H3_SIZE: u16 = 24;
+pub const H4_SIZE: u16 = 20;
+pub const H5_SIZE: u16 = 18;
+pub const P1_SIZE: u16 = 16;
+pub const P2_SIZE: u16 = 14;
+pub const CAPTION_SIZE: u16 = 12;
+
+pub fn h1<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, Theme> {
     iced::widget::Text::new(content)
         .font(font::BOLD)
         .size(H1_SIZE)
 }
 
-pub fn h2<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, iced::Renderer<Theme>> {
+pub fn h2<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, Theme> {
     iced::widget::Text::new(content)
         .font(font::BOLD)
         .size(H2_SIZE)
 }
 
-pub fn h3<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, iced::Renderer<Theme>> {
+pub fn h3<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, Theme> {
     iced::widget::Text::new(content)
         .font(font::BOLD)
         .size(H3_SIZE)
 }
 
-pub fn h4_bold<'a>(
-    content: impl Into<Cow<'a, str>>,
-) -> iced::widget::Text<'a, iced::Renderer<Theme>> {
+pub fn h4_bold<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, Theme> {
     iced::widget::Text::new(content)
         .font(font::BOLD)
         .size(H4_SIZE)
 }
 
-pub fn h4_regular<'a>(
-    content: impl Into<Cow<'a, str>>,
-) -> iced::widget::Text<'a, iced::Renderer<Theme>> {
+pub fn h4_regular<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, Theme> {
     iced::widget::Text::new(content)
         .font(font::REGULAR)
         .size(H4_SIZE)
 }
 
-pub fn h5_medium<'a>(
-    content: impl Into<Cow<'a, str>>,
-) -> iced::widget::Text<'a, iced::Renderer<Theme>> {
+pub fn h5_medium<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, Theme> {
     iced::widget::Text::new(content)
         .font(font::MEDIUM)
         .size(H5_SIZE)
 }
 
-pub fn h5_regular<'a>(
-    content: impl Into<Cow<'a, str>>,
-) -> iced::widget::Text<'a, iced::Renderer<Theme>> {
+pub fn h5_regular<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, Theme> {
     iced::widget::Text::new(content)
         .font(font::REGULAR)
         .size(H5_SIZE)
 }
 
-pub fn p1_bold<'a>(
-    content: impl Into<Cow<'a, str>>,
-) -> iced::widget::Text<'a, iced::Renderer<Theme>> {
+pub fn p1_bold<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, Theme> {
     iced::widget::Text::new(content)
         .font(font::BOLD)
         .size(P1_SIZE)
 }
 
-pub fn p1_medium<'a>(
-    content: impl Into<Cow<'a, str>>,
-) -> iced::widget::Text<'a, iced::Renderer<Theme>> {
+pub fn p1_medium<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, Theme> {
     iced::widget::Text::new(content)
         .font(font::MEDIUM)
         .size(P1_SIZE)
 }
 
-pub fn p1_regular<'a>(
-    content: impl Into<Cow<'a, str>>,
-) -> iced::widget::Text<'a, iced::Renderer<Theme>> {
+pub fn p1_regular<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, Theme> {
     iced::widget::Text::new(content)
         .font(font::REGULAR)
         .size(P1_SIZE)
 }
 
-pub fn p2_medium<'a>(
-    content: impl Into<Cow<'a, str>>,
-) -> iced::widget::Text<'a, iced::Renderer<Theme>> {
+pub fn p2_medium<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, Theme> {
     iced::widget::Text::new(content)
         .font(font::MEDIUM)
         .size(P2_SIZE)
 }
 
-pub fn p2_regular<'a>(
-    content: impl Into<Cow<'a, str>>,
-) -> iced::widget::Text<'a, iced::Renderer<Theme>> {
+pub fn p2_regular<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, Theme> {
     iced::widget::Text::new(content)
         .font(font::REGULAR)
         .size(P2_SIZE)
 }
 
-pub fn caption<'a>(
-    content: impl Into<Cow<'a, str>>,
-) -> iced::widget::Text<'a, iced::Renderer<Theme>> {
+pub fn caption<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, Theme> {
     iced::widget::Text::new(content)
         .font(font::REGULAR)
         .size(CAPTION_SIZE)
 }
 
-pub fn text<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, iced::Renderer<Theme>> {
+pub fn text<'a>(content: impl Into<Cow<'a, str>>) -> iced::widget::Text<'a, Theme> {
     p1_regular(content)
 }
 
@@ -125,7 +97,7 @@ pub trait Text {
     fn small(self) -> Self;
 }
 
-impl Text for iced::widget::Text<'_, iced::Renderer<Theme>> {
+impl Text for iced::widget::Text<'_, Theme> {
     fn bold(self) -> Self {
         self.font(font::BOLD)
     }
diff --git a/gui/ui/src/component/toast.rs b/gui/ui/src/component/toast.rs
index 7a3e3fdd8..7da518cf6 100644
--- a/gui/ui/src/component/toast.rs
+++ b/gui/ui/src/component/toast.rs
@@ -1,29 +1,28 @@
 use std::time::Instant;
 
-use super::theme::Theme;
-
+use iced::advanced::widget::{Operation, Tree};
+use iced::advanced::{layout, mouse, overlay, renderer};
+use iced::advanced::{Clipboard, Layout, Shell, Widget};
+use iced::event::{self, Event};
 use iced::{Alignment, Element, Length, Point, Rectangle, Size, Vector};
-use iced_native::widget::{Operation, Tree};
-use iced_native::{event, layout, mouse, overlay, renderer};
-use iced_native::{Clipboard, Event, Layout, Shell, Widget};
 
 pub trait Toast {
     fn title(&self) -> &str;
     fn body(&self) -> &str;
 }
 
-pub struct Manager<'a, Message, Renderer> {
-    content: Element<'a, Message, Renderer>,
-    toasts: Vec<Element<'a, Message, Renderer>>,
+pub struct Manager<'a, Message, Theme, Renderer> {
+    content: Element<'a, Message, Theme, Renderer>,
+    toasts: Vec<Element<'a, Message, Theme, Renderer>>,
 }
 
-impl<'a, Message> Manager<'a, Message, iced::Renderer<Theme>>
+impl<'a, Message, Theme> Manager<'a, Message, Theme, iced::Renderer>
 where
     Message: 'a + Clone,
 {
     pub fn new(
-        content: impl Into<Element<'a, Message, iced::Renderer<Theme>>>,
-        toasts: Vec<Element<'a, Message, iced::Renderer<Theme>>>,
+        content: impl Into<Element<'a, Message, Theme, iced::Renderer>>,
+        toasts: Vec<Element<'a, Message, Theme, iced::Renderer>>,
     ) -> Self {
         Self {
             content: content.into(),
@@ -32,29 +31,33 @@ where
     }
 }
 
-impl<'a, Message, Renderer> Widget<Message, Renderer> for Manager<'a, Message, Renderer>
+impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
+    for Manager<'a, Message, Theme, Renderer>
 where
-    Renderer: iced_native::Renderer,
+    Renderer: iced::advanced::Renderer,
 {
-    fn width(&self) -> Length {
-        self.content.as_widget().width()
-    }
-
-    fn height(&self) -> Length {
-        self.content.as_widget().height()
+    fn size(&self) -> Size<Length> {
+        self.content.as_widget().size()
     }
 
-    fn layout(&self, renderer: &Renderer, limits: &layout::Limits) -> layout::Node {
-        self.content.as_widget().layout(renderer, limits)
+    fn layout(
+        &self,
+        tree: &mut Tree,
+        renderer: &Renderer,
+        limits: &layout::Limits,
+    ) -> layout::Node {
+        self.content
+            .as_widget()
+            .layout(&mut tree.children[0], renderer, limits)
     }
 
-    fn tag(&self) -> iced_native::widget::tree::Tag {
+    fn tag(&self) -> iced::advanced::widget::tree::Tag {
         struct Marker(Vec<Instant>);
-        iced_native::widget::tree::Tag::of::<Marker>()
+        iced::advanced::widget::tree::Tag::of::<Marker>()
     }
 
-    fn state(&self) -> iced_native::widget::tree::State {
-        iced_native::widget::tree::State::new(Vec::<Option<Instant>>::new())
+    fn state(&self) -> iced::advanced::widget::tree::State {
+        iced::advanced::widget::tree::State::new(Vec::<Option<Instant>>::new())
     }
 
     fn children(&self) -> Vec<Tree> {
@@ -95,7 +98,7 @@ where
         renderer: &Renderer,
         operation: &mut dyn Operation<Message>,
     ) {
-        operation.container(None, &mut |operation| {
+        operation.container(None, layout.bounds(), &mut |operation| {
             self.content
                 .as_widget()
                 .operate(&mut state.children[0], layout, renderer, operation);
@@ -107,10 +110,11 @@ where
         state: &mut Tree,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor_position: iced::mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
+        viewport: &Rectangle,
     ) -> event::Status {
         self.content.as_widget_mut().on_event(
             &mut state.children[0],
@@ -120,6 +124,7 @@ where
             renderer,
             clipboard,
             shell,
+            viewport,
         )
     }
 
@@ -127,10 +132,10 @@ where
         &self,
         state: &Tree,
         renderer: &mut Renderer,
-        theme: &<Renderer as iced_native::Renderer>::Theme,
+        theme: &Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor_position: iced::mouse::Cursor,
         viewport: &Rectangle,
     ) {
         self.content.as_widget().draw(
@@ -148,7 +153,7 @@ where
         &self,
         state: &Tree,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor_position: iced::mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
@@ -166,25 +171,26 @@ where
         state: &'b mut Tree,
         layout: Layout<'_>,
         renderer: &Renderer,
-    ) -> Option<overlay::Element<'b, Message, Renderer>> {
+        translation: Vector,
+    ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
         let instants = state.state.downcast_mut::<Vec<Option<Instant>>>();
 
         let (content_state, toasts_state) = state.children.split_at_mut(1);
 
-        let content = self
-            .content
-            .as_widget_mut()
-            .overlay(&mut content_state[0], layout, renderer);
+        let content = self.content.as_widget_mut().overlay(
+            &mut content_state[0],
+            layout,
+            renderer,
+            translation,
+        );
 
         let toasts = (!self.toasts.is_empty()).then(|| {
-            overlay::Element::new(
-                layout.bounds().position(),
-                Box::new(Overlay {
-                    toasts: &mut self.toasts,
-                    state: toasts_state,
-                    instants,
-                }),
-            )
+            overlay::Element::new(Box::new(Overlay {
+                position: layout.bounds().position() + translation,
+                toasts: &mut self.toasts,
+                state: toasts_state,
+                instants,
+            }))
         });
         let overlays = content.into_iter().chain(toasts).collect::<Vec<_>>();
 
@@ -192,18 +198,19 @@ where
     }
 }
 
-struct Overlay<'a, 'b, Message, Renderer> {
-    toasts: &'b mut [Element<'a, Message, Renderer>],
+struct Overlay<'a, 'b, Message, Theme, Renderer> {
+    position: Point,
+    toasts: &'b mut [Element<'a, Message, Theme, Renderer>],
     state: &'b mut [Tree],
     instants: &'b mut [Option<Instant>],
 }
 
-impl<'a, 'b, Message, Renderer> overlay::Overlay<Message, Renderer>
-    for Overlay<'a, 'b, Message, Renderer>
+impl<'a, 'b, Message, Theme, Renderer> overlay::Overlay<Message, Theme, Renderer>
+    for Overlay<'a, 'b, Message, Theme, Renderer>
 where
-    Renderer: iced_native::Renderer,
+    Renderer: iced::advanced::Renderer,
 {
-    fn layout(&self, renderer: &Renderer, bounds: Size, position: Point) -> layout::Node {
+    fn layout(&mut self, renderer: &Renderer, bounds: Size) -> layout::Node {
         let limits = layout::Limits::new(Size::ZERO, bounds)
             .width(Length::Fill)
             .height(Length::Fill);
@@ -212,23 +219,27 @@ where
             layout::flex::Axis::Vertical,
             renderer,
             &limits,
+            Length::Fill,
+            Length::Fill,
             10.into(),
             10.0,
             Alignment::End,
             self.toasts,
+            self.state,
         )
-        .translate(Vector::new(position.x, position.y))
+        .translate(Vector::new(self.position.x, self.position.y))
     }
 
     fn on_event(
         &mut self,
         event: Event,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor_position: iced::mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
     ) -> event::Status {
+        let viewport = layout.bounds();
         self.toasts
             .iter_mut()
             .zip(self.state.iter_mut())
@@ -246,6 +257,7 @@ where
                     renderer,
                     clipboard,
                     &mut local_shell,
+                    &viewport,
                 );
 
                 if !local_shell.is_empty() {
@@ -262,10 +274,10 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
-        theme: &<Renderer as iced_native::Renderer>::Theme,
+        theme: &Theme,
         style: &renderer::Style,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor_position: iced::mouse::Cursor,
     ) {
         let viewport = layout.bounds();
 
@@ -291,9 +303,9 @@ where
         &mut self,
         layout: Layout<'_>,
         renderer: &Renderer,
-        operation: &mut dyn iced_native::widget::Operation<Message>,
+        operation: &mut dyn iced::advanced::widget::Operation<Message>,
     ) {
-        operation.container(None, &mut |operation| {
+        operation.container(None, layout.bounds(), &mut |operation| {
             self.toasts
                 .iter()
                 .zip(self.state.iter_mut())
@@ -309,7 +321,7 @@ where
     fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        cursor_position: Point,
+        cursor_position: iced::mouse::Cursor,
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
@@ -330,19 +342,21 @@ where
             .unwrap_or_default()
     }
 
-    fn is_over(&self, layout: Layout<'_>, cursor_position: Point) -> bool {
+    fn is_over(&self, layout: Layout<'_>, _renderer: &Renderer, cursor_position: Point) -> bool {
         layout
             .children()
             .any(|layout| layout.bounds().contains(cursor_position))
     }
 }
 
-impl<'a, Message, Renderer> From<Manager<'a, Message, Renderer>> for Element<'a, Message, Renderer>
+impl<'a, Message, Theme, Renderer> From<Manager<'a, Message, Theme, Renderer>>
+    for Element<'a, Message, Theme, Renderer>
 where
-    Renderer: 'a + iced_native::Renderer,
+    Renderer: 'a + iced::advanced::Renderer,
     Message: 'a,
+    Theme: 'a,
 {
-    fn from(manager: Manager<'a, Message, Renderer>) -> Self {
+    fn from(manager: Manager<'a, Message, Theme, Renderer>) -> Self {
         Element::new(manager)
     }
 }
diff --git a/gui/ui/src/font.rs b/gui/ui/src/font.rs
index 2b5ea5dfd..c06fd76ea 100644
--- a/gui/ui/src/font.rs
+++ b/gui/ui/src/font.rs
@@ -1,18 +1,37 @@
-use iced::Font;
+use iced::{
+    font::{Family, Stretch, Weight},
+    Command, Font,
+};
 
-pub const BOLD: Font = Font::External {
-    name: "Bold",
-    bytes: include_bytes!("../static/fonts/IBMPlexSans-Bold.ttf"),
+pub const BOLD: Font = Font {
+    family: Family::Name("IBM Plex Sans"),
+    weight: Weight::Bold,
+    style: iced::font::Style::Normal,
+    stretch: Stretch::Normal,
 };
 
-pub const MEDIUM: Font = Font::External {
-    name: "Regular",
-    bytes: include_bytes!("../static/fonts/IBMPlexSans-Medium.ttf"),
+pub const MEDIUM: Font = Font {
+    family: Family::Name("IBM Plex Sans"),
+    weight: Weight::Medium,
+    style: iced::font::Style::Normal,
+    stretch: Stretch::Normal,
 };
 
+pub const REGULAR: Font = Font::with_name("IBM Plex Sans");
+
+pub const BOLD_BYTES: &[u8] = include_bytes!("../static/fonts/IBMPlexSans-Bold.ttf");
+pub const MEDIUM_BYTES: &[u8] = include_bytes!("../static/fonts/IBMPlexSans-Medium.ttf");
 pub const REGULAR_BYTES: &[u8] = include_bytes!("../static/fonts/IBMPlexSans-Regular.ttf");
 
-pub const REGULAR: Font = Font::External {
-    name: "Regular",
-    bytes: REGULAR_BYTES,
-};
+pub const ICONEX_ICONS_BYTES: &[u8] = include_bytes!("../static/icons/iconex/iconex-icons.ttf");
+pub const BOOTSTRAP_ICONS_BYTE: &[u8] = include_bytes!("../static/icons/bootstrap-icons.ttf");
+
+pub fn loads<T: From<Result<(), iced::font::Error>> + 'static>() -> Vec<Command<T>> {
+    vec![
+        iced::font::load(BOLD_BYTES).map(T::from),
+        iced::font::load(MEDIUM_BYTES).map(T::from),
+        iced::font::load(REGULAR_BYTES).map(T::from),
+        iced::font::load(ICONEX_ICONS_BYTES).map(T::from),
+        iced::font::load(BOOTSTRAP_ICONS_BYTE).map(T::from),
+    ]
+}
diff --git a/gui/ui/src/icon.rs b/gui/ui/src/icon.rs
index c36900bc4..1b09f48de 100644
--- a/gui/ui/src/icon.rs
+++ b/gui/ui/src/icon.rs
@@ -1,10 +1,7 @@
 use crate::{component::text::P1_SIZE, widget::*};
 use iced::{alignment, Font, Length};
 
-const BOOTSTRAP_ICONS: Font = Font::External {
-    name: "Bootstrap icons",
-    bytes: include_bytes!("../static/icons/bootstrap-icons.ttf"),
-};
+const BOOTSTRAP_ICONS: Font = Font::with_name("bootstrap-icons");
 
 fn bootstrap_icon(unicode: char) -> Text<'static> {
     Text::new(unicode.to_string())
@@ -118,10 +115,7 @@ pub fn previous_icon() -> Text<'static> {
     bootstrap_icon('\u{F284}')
 }
 
-const ICONEX_ICONS: Font = Font::External {
-    name: "Iconex icons",
-    bytes: include_bytes!("../static/icons/iconex/iconex-icons.ttf"),
-};
+const ICONEX_ICONS: Font = Font::with_name("Untitled1");
 
 fn iconex_icon(unicode: char) -> Text<'static> {
     Text::new(unicode.to_string())
diff --git a/gui/ui/src/lib.rs b/gui/ui/src/lib.rs
index 213df10f6..b6fa8392f 100644
--- a/gui/ui/src/lib.rs
+++ b/gui/ui/src/lib.rs
@@ -4,22 +4,24 @@ pub mod font;
 pub mod icon;
 pub mod image;
 pub mod theme;
-pub mod util;
 
 pub mod widget {
     #![allow(dead_code)]
     use crate::theme::Theme;
 
-    pub type Renderer = iced::Renderer<Theme>;
-    pub type Element<'a, Message> = iced::Element<'a, Message, Renderer>;
-    pub type Container<'a, Message> = iced::widget::Container<'a, Message, Renderer>;
-    pub type Column<'a, Message> = iced::widget::Column<'a, Message, Renderer>;
-    pub type Row<'a, Message> = iced::widget::Row<'a, Message, Renderer>;
-    pub type Button<'a, Message> = iced::widget::Button<'a, Message, Renderer>;
-    pub type Text<'a> = iced::widget::Text<'a, Renderer>;
-    pub type Tooltip<'a> = iced::widget::Tooltip<'a, Renderer>;
-    pub type ProgressBar = iced::widget::ProgressBar<Renderer>;
-    pub type PickList<'a, Message> = iced::widget::PickList<'a, Message, Renderer>;
-    pub type Scrollable<'a, Message> = iced::widget::Scrollable<'a, Message, Renderer>;
-    pub type Svg = iced::widget::Svg<Renderer>;
+    pub type Renderer = iced::Renderer;
+    pub type Element<'a, Message> = iced::Element<'a, Message, Theme, Renderer>;
+    pub type Container<'a, Message> = iced::widget::Container<'a, Message, Theme, Renderer>;
+    pub type Column<'a, Message> = iced::widget::Column<'a, Message, Theme, Renderer>;
+    pub type Row<'a, Message> = iced::widget::Row<'a, Message, Theme, Renderer>;
+    pub type Button<'a, Message> = iced::widget::Button<'a, Message, Theme, Renderer>;
+    pub type CheckBox<'a, Message> = iced::widget::Checkbox<'a, Message, Theme, Renderer>;
+    pub type Text<'a> = iced::widget::Text<'a, Theme, Renderer>;
+    pub type TextInput<'a, Message> = iced::widget::TextInput<'a, Message, Theme, Renderer>;
+    pub type Tooltip<'a> = iced::widget::Tooltip<'a, Theme, Renderer>;
+    pub type ProgressBar = iced::widget::ProgressBar<Theme>;
+    pub type PickList<'a, T, L, V, Message> =
+        iced::widget::PickList<'a, T, L, V, Message, Theme, Renderer>;
+    pub type Scrollable<'a, Message> = iced::widget::Scrollable<'a, Message, Theme, Renderer>;
+    pub type Svg = iced::widget::Svg<Theme>;
 }
diff --git a/gui/ui/src/theme.rs b/gui/ui/src/theme.rs
index e6a239825..d6c8096f9 100644
--- a/gui/ui/src/theme.rs
+++ b/gui/ui/src/theme.rs
@@ -1,8 +1,8 @@
 use iced::{
     application,
     widget::{
-        button, checkbox, container, pick_list, progress_bar, radio, scrollable, slider, svg, text,
-        text_input,
+        button, checkbox, container, pick_list, progress_bar, qr_code, radio, scrollable, slider,
+        svg, text, text_input,
     },
 };
 
@@ -44,9 +44,11 @@ impl iced::overlay::menu::StyleSheet for Theme {
         iced::overlay::menu::Appearance {
             text_color: color::GREY_2,
             background: color::GREY_6.into(),
-            border_width: 0.0,
-            border_radius: 25.0,
-            border_color: color::GREY_2,
+            border: iced::Border {
+                color: color::GREY_2,
+                width: 0.0,
+                radius: 25.0.into(),
+            },
             selected_text_color: color::LIGHT_BLACK,
             selected_background: color::GREEN.into(),
         }
@@ -103,21 +105,24 @@ impl container::StyleSheet for Theme {
         match self {
             Theme::Light => match style {
                 Container::Transparent => container::Appearance {
-                    background: iced::Color::TRANSPARENT.into(),
+                    background: Some(iced::Color::TRANSPARENT.into()),
                     ..container::Appearance::default()
                 },
                 Container::Background => container::Appearance {
-                    background: color::GREY_2.into(),
+                    background: Some(color::GREY_2.into()),
                     ..container::Appearance::default()
                 },
                 Container::Foreground => container::Appearance {
-                    background: color::GREY_2.into(),
+                    background: Some(color::GREY_2.into()),
                     ..container::Appearance::default()
                 },
                 Container::Border => container::Appearance {
-                    background: iced::Color::TRANSPARENT.into(),
-                    border_width: 1.0,
-                    border_color: color::LIGHT_BLACK,
+                    background: Some(iced::Color::TRANSPARENT.into()),
+                    border: iced::Border {
+                        color: color::LIGHT_BLACK,
+                        width: 1.0,
+                        radius: 0.0.into(),
+                    },
                     ..container::Appearance::default()
                 },
                 Container::Card(c) => c.appearance(self),
@@ -125,32 +130,39 @@ impl container::StyleSheet for Theme {
                 Container::Pill(c) => c.appearance(self),
                 Container::Notification(c) => c.appearance(self),
                 Container::Custom(c) => container::Appearance {
-                    background: (*c).into(),
+                    background: Some((*c).into()),
                     ..container::Appearance::default()
                 },
                 Container::QrCode => container::Appearance {
-                    background: color::WHITE.into(),
-                    border_radius: 25.0,
+                    background: Some(color::WHITE.into()),
+                    border: iced::Border {
+                        color: color::TRANSPARENT,
+                        width: 0.0,
+                        radius: 25.0.into(),
+                    },
                     ..container::Appearance::default()
                 },
             },
             Theme::Dark => match style {
                 Container::Transparent => container::Appearance {
-                    background: iced::Color::TRANSPARENT.into(),
+                    background: Some(iced::Color::TRANSPARENT.into()),
                     ..container::Appearance::default()
                 },
                 Container::Background => container::Appearance {
-                    background: color::LIGHT_BLACK.into(),
+                    background: Some(color::LIGHT_BLACK.into()),
                     ..container::Appearance::default()
                 },
                 Container::Foreground => container::Appearance {
-                    background: color::BLACK.into(),
+                    background: Some(color::BLACK.into()),
                     ..container::Appearance::default()
                 },
                 Container::Border => container::Appearance {
-                    background: iced::Color::TRANSPARENT.into(),
-                    border_width: 1.0,
-                    border_color: color::GREY_3,
+                    background: Some(iced::Color::TRANSPARENT.into()),
+                    border: iced::Border {
+                        color: color::GREY_3,
+                        width: 1.0,
+                        radius: 0.0.into(),
+                    },
                     ..container::Appearance::default()
                 },
                 Container::Card(c) => c.appearance(self),
@@ -158,12 +170,16 @@ impl container::StyleSheet for Theme {
                 Container::Pill(c) => c.appearance(self),
                 Container::Notification(c) => c.appearance(self),
                 Container::Custom(c) => container::Appearance {
-                    background: (*c).into(),
+                    background: Some((*c).into()),
                     ..container::Appearance::default()
                 },
                 Container::QrCode => container::Appearance {
-                    background: color::WHITE.into(),
-                    border_radius: 25.0,
+                    background: Some(color::WHITE.into()),
+                    border: iced::Border {
+                        color: color::TRANSPARENT,
+                        width: 0.0,
+                        radius: 25.0.into(),
+                    },
                     ..container::Appearance::default()
                 },
             },
@@ -201,34 +217,46 @@ impl Notification {
         match theme {
             Theme::Light => match self {
                 Self::Pending => container::Appearance {
-                    background: color::GREEN.into(),
+                    background: Some(iced::Background::Color(color::GREEN)),
                     text_color: color::LIGHT_BLACK.into(),
-                    border_width: 1.0,
-                    border_color: color::GREEN,
-                    border_radius: 25.0,
+                    border: iced::Border {
+                        color: color::GREEN,
+                        width: 1.0,
+                        radius: 25.0.into(),
+                    },
+                    ..container::Appearance::default()
                 },
                 Self::Error => container::Appearance {
-                    background: color::ORANGE.into(),
+                    background: Some(iced::Background::Color(color::ORANGE)),
                     text_color: color::LIGHT_BLACK.into(),
-                    border_width: 1.0,
-                    border_color: color::ORANGE,
-                    border_radius: 25.0,
+                    border: iced::Border {
+                        color: color::ORANGE,
+                        width: 1.0,
+                        radius: 25.0.into(),
+                    },
+                    ..container::Appearance::default()
                 },
             },
             Theme::Dark => match self {
                 Self::Pending => container::Appearance {
-                    background: color::GREEN.into(),
+                    background: Some(iced::Background::Color(color::GREEN)),
                     text_color: color::LIGHT_BLACK.into(),
-                    border_width: 1.0,
-                    border_color: color::GREEN,
-                    border_radius: 25.0,
+                    border: iced::Border {
+                        color: color::GREEN,
+                        width: 1.0,
+                        radius: 25.0.into(),
+                    },
+                    ..container::Appearance::default()
                 },
                 Self::Error => container::Appearance {
-                    background: color::ORANGE.into(),
+                    background: Some(iced::Background::Color(color::ORANGE)),
                     text_color: color::LIGHT_BLACK.into(),
-                    border_width: 1.0,
-                    border_color: color::ORANGE,
-                    border_radius: 25.0,
+                    border: iced::Border {
+                        color: color::ORANGE,
+                        width: 1.0,
+                        radius: 25.0.into(),
+                    },
+                    ..container::Appearance::default()
                 },
             },
         }
@@ -250,65 +278,85 @@ impl Card {
         match theme {
             Theme::Light => match self {
                 Card::Simple => container::Appearance {
-                    background: color::GREY_2.into(),
+                    background: Some(color::GREY_2.into()),
                     ..container::Appearance::default()
                 },
                 Card::Border => container::Appearance {
-                    background: iced::Color::TRANSPARENT.into(),
-                    border_radius: 10.0,
-                    border_color: color::GREY_2,
-                    border_width: 1.0,
+                    background: Some(iced::Color::TRANSPARENT.into()),
+                    border: iced::Border {
+                        color: color::GREY_2,
+                        width: 1.0,
+                        radius: 10.0.into(),
+                    },
                     ..container::Appearance::default()
                 },
                 Card::Invalid => container::Appearance {
-                    background: color::GREY_2.into(),
+                    background: Some(color::GREY_2.into()),
                     text_color: color::BLACK.into(),
-                    border_width: 1.0,
-                    border_color: color::RED,
+                    border: iced::Border {
+                        color: color::RED,
+                        width: 1.0,
+                        radius: 0.0.into(),
+                    },
                     ..container::Appearance::default()
                 },
                 Card::Error => container::Appearance {
-                    background: color::GREY_2.into(),
+                    background: Some(color::GREY_2.into()),
                     text_color: color::RED.into(),
-                    border_width: 1.0,
-                    border_color: color::RED,
+                    border: iced::Border {
+                        color: color::RED,
+                        width: 1.0,
+                        radius: 0.0.into(),
+                    },
                     ..container::Appearance::default()
                 },
                 Card::Warning => container::Appearance {
-                    background: color::ORANGE.into(),
+                    background: Some(color::ORANGE.into()),
                     text_color: color::GREY_2.into(),
                     ..container::Appearance::default()
                 },
             },
             Theme::Dark => match self {
                 Card::Simple => container::Appearance {
-                    background: color::GREY_6.into(),
-                    border_radius: 25.0,
+                    background: Some(color::GREY_6.into()),
+                    border: iced::Border {
+                        color: color::TRANSPARENT,
+                        width: 0.0,
+                        radius: 25.0.into(),
+                    },
                     ..container::Appearance::default()
                 },
                 Card::Border => container::Appearance {
-                    background: iced::Color::TRANSPARENT.into(),
-                    border_radius: 25.0,
-                    border_color: color::GREY_5,
-                    border_width: 1.0,
+                    background: Some(iced::Color::TRANSPARENT.into()),
+                    border: iced::Border {
+                        color: color::GREY_5,
+                        width: 1.0,
+                        radius: 25.0.into(),
+                    },
                     ..container::Appearance::default()
                 },
                 Card::Invalid => container::Appearance {
-                    background: color::LIGHT_BLACK.into(),
+                    background: Some(color::LIGHT_BLACK.into()),
                     text_color: color::RED.into(),
-                    border_width: 1.0,
-                    border_radius: 25.0,
-                    border_color: color::RED,
+                    border: iced::Border {
+                        color: color::RED,
+                        width: 1.0,
+                        radius: 25.0.into(),
+                    },
+                    ..container::Appearance::default()
                 },
                 Card::Error => container::Appearance {
-                    background: color::LIGHT_BLACK.into(),
+                    background: Some(color::LIGHT_BLACK.into()),
                     text_color: color::RED.into(),
-                    border_width: 1.0,
-                    border_color: color::RED,
+                    border: iced::Border {
+                        color: color::RED,
+                        width: 1.0,
+                        radius: 25.0.into(),
+                    },
                     ..container::Appearance::default()
                 },
                 Card::Warning => container::Appearance {
-                    background: color::ORANGE.into(),
+                    background: Some(color::ORANGE.into()),
                     text_color: color::LIGHT_BLACK.into(),
                     ..container::Appearance::default()
                 },
@@ -328,13 +376,21 @@ impl Badge {
     fn appearance(&self, _theme: &Theme) -> iced::widget::container::Appearance {
         match self {
             Self::Standard => container::Appearance {
-                border_radius: 40.0,
-                background: color::GREY_4.into(),
+                border: iced::Border {
+                    color: color::TRANSPARENT,
+                    width: 0.0,
+                    radius: 40.0.into(),
+                },
+                background: Some(color::GREY_4.into()),
                 ..container::Appearance::default()
             },
             Self::Bitcoin => container::Appearance {
-                border_radius: 40.0,
-                background: color::ORANGE.into(),
+                border: iced::Border {
+                    color: color::TRANSPARENT,
+                    width: 0.0,
+                    radius: 40.0.into(),
+                },
+                background: Some(color::ORANGE.into()),
                 text_color: iced::Color::WHITE.into(),
                 ..container::Appearance::default()
             },
@@ -355,30 +411,44 @@ impl Pill {
     fn appearance(&self, _theme: &Theme) -> iced::widget::container::Appearance {
         match self {
             Self::Primary => container::Appearance {
-                background: color::GREEN.into(),
-                border_radius: 25.0,
+                background: Some(color::GREEN.into()),
+                border: iced::Border {
+                    color: color::TRANSPARENT,
+                    width: 0.0,
+                    radius: 25.0.into(),
+                },
                 text_color: color::LIGHT_BLACK.into(),
                 ..container::Appearance::default()
             },
             Self::Success => container::Appearance {
-                background: color::GREEN.into(),
-                border_radius: 25.0,
+                background: Some(color::GREEN.into()),
+                border: iced::Border {
+                    color: color::TRANSPARENT,
+                    width: 0.0,
+                    radius: 25.0.into(),
+                },
                 text_color: color::LIGHT_BLACK.into(),
                 ..container::Appearance::default()
             },
             Self::Simple => container::Appearance {
-                background: iced::Color::TRANSPARENT.into(),
-                border_radius: 25.0,
-                border_width: 1.0,
-                border_color: color::GREY_3,
+                background: Some(iced::Color::TRANSPARENT.into()),
+                border: iced::Border {
+                    color: color::GREY_3,
+                    width: 1.0,
+                    radius: 25.0.into(),
+                },
                 text_color: color::GREY_3.into(),
+                ..container::Appearance::default()
             },
             Self::Warning => container::Appearance {
-                background: iced::Color::TRANSPARENT.into(),
-                border_radius: 25.0,
-                border_width: 1.0,
-                border_color: color::RED,
+                background: Some(iced::Color::TRANSPARENT.into()),
+                border: iced::Border {
+                    color: color::RED,
+                    width: 1.0,
+                    radius: 25.0.into(),
+                },
                 text_color: color::RED.into(),
+                ..container::Appearance::default()
             },
         }
     }
@@ -415,24 +485,32 @@ pub struct Scrollable {}
 impl scrollable::StyleSheet for Theme {
     type Style = Scrollable;
 
-    fn active(&self, _style: &Self::Style) -> scrollable::Scrollbar {
-        scrollable::Scrollbar {
-            background: None,
-            border_width: 0.0,
-            border_color: color::GREY_7,
-            border_radius: 10.0,
-            scroller: scrollable::Scroller {
-                color: color::GREY_7,
-                border_radius: 10.0,
-                border_width: 0.0,
-                border_color: iced::Color::TRANSPARENT,
+    fn active(&self, _style: &Self::Style) -> scrollable::Appearance {
+        scrollable::Appearance {
+            gap: None,
+            container: container::Appearance::default(),
+            scrollbar: scrollable::Scrollbar {
+                background: None,
+                border: iced::Border {
+                    color: color::GREY_3,
+                    width: 0.0,
+                    radius: 10.0.into(),
+                },
+                scroller: scrollable::Scroller {
+                    color: color::GREY_7,
+                    border: iced::Border {
+                        color: color::TRANSPARENT,
+                        width: 0.0,
+                        radius: 10.0.into(),
+                    },
+                },
             },
         }
     }
 
-    fn hovered(&self, style: &Self::Style, _is_hovered: bool) -> scrollable::Scrollbar {
+    fn hovered(&self, style: &Self::Style, _is_hovered: bool) -> scrollable::Appearance {
         let active = self.active(style);
-        scrollable::Scrollbar { ..active }
+        scrollable::Appearance { ..active }
     }
 }
 
@@ -452,27 +530,33 @@ impl pick_list::StyleSheet for Theme {
                 placeholder_color: color::GREY_6,
                 handle_color: color::GREY_6,
                 background: color::GREEN.into(),
-                border_width: 1.0,
-                border_color: color::GREY_7,
-                border_radius: 25.0,
+                border: iced::Border {
+                    color: color::GREY_7,
+                    width: 1.0,
+                    radius: 25.0.into(),
+                },
                 text_color: iced::Color::BLACK,
             },
             PickList::Invalid => pick_list::Appearance {
                 placeholder_color: color::GREY_6,
                 handle_color: color::GREY_6,
                 background: color::GREY_6.into(),
-                border_width: 1.0,
-                border_color: color::RED,
-                border_radius: 25.0,
+                border: iced::Border {
+                    color: color::RED,
+                    width: 1.0,
+                    radius: 25.0.into(),
+                },
                 text_color: color::RED,
             },
             PickList::Secondary => pick_list::Appearance {
-                placeholder_color: color::GREY_3,
-                handle_color: color::GREY_3,
-                background: color::TRANSPARENT.into(),
-                border_width: 1.0,
-                border_color: color::GREY_3,
-                border_radius: 25.0,
+                placeholder_color: color::GREY_6,
+                handle_color: color::GREY_6,
+                background: color::GREY_6.into(),
+                border: iced::Border {
+                    color: color::GREY_7,
+                    width: 1.0,
+                    radius: 25.0.into(),
+                },
                 text_color: color::GREY_2,
             },
         }
@@ -493,20 +577,24 @@ impl checkbox::StyleSheet for Theme {
         if is_selected {
             checkbox::Appearance {
                 background: color::GREEN.into(),
-                border_width: 0.0,
-                border_color: iced::Color::TRANSPARENT,
                 icon_color: color::GREY_4,
                 text_color: None,
-                border_radius: 4.0,
+                border: iced::Border {
+                    color: color::TRANSPARENT,
+                    width: 1.0,
+                    radius: 4.0.into(),
+                },
             }
         } else {
             checkbox::Appearance {
                 background: color::GREY_4.into(),
-                border_width: 0.0,
-                border_color: iced::Color::TRANSPARENT,
                 icon_color: color::GREEN,
                 text_color: None,
-                border_radius: 4.0,
+                border: iced::Border {
+                    color: color::TRANSPARENT,
+                    width: 0.0,
+                    radius: 4.0.into(),
+                },
             }
         }
     }
@@ -538,64 +626,85 @@ impl button::StyleSheet for Theme {
             Theme::Dark => match style {
                 Button::Primary => button::Appearance {
                     shadow_offset: iced::Vector::default(),
-                    background: iced::Color::TRANSPARENT.into(),
-                    border_radius: 25.0,
-                    border_width: 1.0,
-                    border_color: color::GREY_7,
+                    background: Some(iced::Color::TRANSPARENT.into()),
                     text_color: color::GREY_2,
+                    border: iced::Border {
+                        color: color::GREY_7,
+                        width: 1.0,
+                        radius: 25.0.into(),
+                    },
+                    ..button::Appearance::default()
                 },
                 Button::Secondary | Button::SecondaryDestructive | Button::Border => {
                     button::Appearance {
                         shadow_offset: iced::Vector::default(),
-                        background: iced::Color::TRANSPARENT.into(),
-                        border_radius: 25.0,
-                        border_width: 1.0,
-                        border_color: color::GREY_7,
+                        background: Some(iced::Color::TRANSPARENT.into()),
                         text_color: color::GREY_2,
+                        border: iced::Border {
+                            color: color::GREY_7,
+                            width: 1.0,
+                            radius: 25.0.into(),
+                        },
+                        ..button::Appearance::default()
                     }
                 }
                 Button::Destructive => button::Appearance {
                     shadow_offset: iced::Vector::default(),
-                    background: iced::Color::TRANSPARENT.into(),
-                    border_radius: 25.0,
-                    border_width: 1.0,
-                    border_color: color::RED,
+                    background: Some(iced::Color::TRANSPARENT.into()),
                     text_color: color::RED,
+                    border: iced::Border {
+                        color: color::RED,
+                        width: 1.0,
+                        radius: 25.0.into(),
+                    },
+                    ..button::Appearance::default()
                 },
                 Button::Transparent => button::Appearance {
                     shadow_offset: iced::Vector::default(),
-                    background: iced::Color::TRANSPARENT.into(),
-                    border_radius: 25.0,
-                    border_width: 0.0,
-                    border_color: iced::Color::TRANSPARENT,
+                    background: Some(iced::Color::TRANSPARENT.into()),
                     text_color: color::GREY_2,
+                    border: iced::Border {
+                        color: color::TRANSPARENT,
+                        width: 0.0,
+                        radius: 25.0.into(),
+                    },
+                    ..button::Appearance::default()
                 },
                 Button::TransparentBorder => button::Appearance {
                     shadow_offset: iced::Vector::default(),
-                    background: iced::Color::TRANSPARENT.into(),
-                    border_radius: 25.0,
-                    border_width: 0.0,
-                    border_color: iced::Color::TRANSPARENT,
+                    background: Some(iced::Color::TRANSPARENT.into()),
                     text_color: color::WHITE,
+                    border: iced::Border {
+                        color: color::TRANSPARENT,
+                        width: 0.0,
+                        radius: 25.0.into(),
+                    },
+                    ..button::Appearance::default()
                 },
                 Button::Menu(active) => {
                     if *active {
                         button::Appearance {
                             shadow_offset: iced::Vector::default(),
-                            background: color::LIGHT_BLACK.into(),
-                            border_radius: 25.0,
-                            border_width: 0.0,
-                            border_color: iced::Color::TRANSPARENT,
+                            background: Some(color::LIGHT_BLACK.into()),
                             text_color: color::WHITE,
+                            border: iced::Border {
+                                color: color::TRANSPARENT,
+                                width: 0.0,
+                                radius: 25.0.into(),
+                            },
+                            ..button::Appearance::default()
                         }
                     } else {
                         button::Appearance {
                             shadow_offset: iced::Vector::default(),
-                            background: iced::Color::TRANSPARENT.into(),
-                            border_radius: 25.0,
-                            border_width: 0.0,
-                            border_color: iced::Color::TRANSPARENT,
+                            background: Some(iced::Color::TRANSPARENT.into()),
                             text_color: color::WHITE,
+                            border: iced::Border {
+                                color: color::TRANSPARENT,
+                                width: 0.0,
+                                radius: 25.0.into(),
+                            },
+                            ..button::Appearance::default()
                         }
                     }
                 }
@@ -609,51 +718,69 @@ impl button::StyleSheet for Theme {
             Theme::Dark => match style {
                 Button::Primary => button::Appearance {
                     shadow_offset: iced::Vector::default(),
-                    background: color::GREEN.into(),
-                    border_radius: 25.0,
-                    border_width: 0.0,
-                    border_color: iced::Color::TRANSPARENT,
+                    background: Some(color::GREEN.into()),
                     text_color: color::LIGHT_BLACK,
+                    border: iced::Border {
+                        color: color::TRANSPARENT,
+                        width: 0.0,
+                        radius: 25.0.into(),
+                    },
+                    ..button::Appearance::default()
                 },
                 Button::Secondary => button::Appearance {
                     shadow_offset: iced::Vector::default(),
-                    background: color::GREEN.into(),
-                    border_radius: 25.0,
-                    border_width: 0.0,
-                    border_color: iced::Color::TRANSPARENT,
+                    background: Some(color::GREEN.into()),
                     text_color: color::LIGHT_BLACK,
+                    border: iced::Border {
+                        color: color::TRANSPARENT,
+                        width: 0.0,
+                        radius: 25.0.into(),
+                    },
+                    ..button::Appearance::default()
                 },
                 Button::Destructive | Button::SecondaryDestructive => button::Appearance {
                     shadow_offset: iced::Vector::default(),
-                    background: color::RED.into(),
-                    border_radius: 25.0,
-                    border_width: 0.0,
-                    border_color: iced::Color::TRANSPARENT,
+                    background: Some(color::RED.into()),
                     text_color: color::LIGHT_BLACK,
+                    border: iced::Border {
+                        color: color::TRANSPARENT,
+                        width: 0.0,
+                        radius: 25.0.into(),
+                    },
+                    ..button::Appearance::default()
                 },
                 Button::Transparent => button::Appearance {
                     shadow_offset: iced::Vector::default(),
-                    background: iced::Color::TRANSPARENT.into(),
-                    border_radius: 25.0,
-                    border_width: 0.0,
-                    border_color: iced::Color::TRANSPARENT,
+                    background: Some(iced::Color::TRANSPARENT.into()),
                     text_color: color::GREY_2,
+                    border: iced::Border {
+                        color: color::TRANSPARENT,
+                        width: 0.0,
+                        radius: 25.0.into(),
+                    },
+                    ..button::Appearance::default()
                 },
                 Button::TransparentBorder | Button::Border => button::Appearance {
                     shadow_offset: iced::Vector::default(),
-                    background: iced::Color::TRANSPARENT.into(),
-                    border_radius: 25.0,
-                    border_width: 1.0,
-                    border_color: color::GREEN,
+                    background: Some(iced::Color::TRANSPARENT.into()),
                     text_color: color::WHITE,
+                    border: iced::Border {
+                        color: color::GREEN,
+                        width: 1.0,
+                        radius: 25.0.into(),
+                    },
+                    ..button::Appearance::default()
                 },
                 Button::Menu(_) => button::Appearance {
                     shadow_offset: iced::Vector::default(),
-                    background: color::LIGHT_BLACK.into(),
-                    border_radius: 25.0,
-                    border_width: 0.0,
-                    border_color: iced::Color::TRANSPARENT,
+                    background: Some(color::LIGHT_BLACK.into()),
                     text_color: color::WHITE,
+                    border: iced::Border {
+                        color: color::TRANSPARENT,
+                        width: 0.0,
+                        radius: 25.0.into(),
+                    },
+                    ..button::Appearance::default()
                 },
             },
         }
@@ -674,16 +801,20 @@ impl text_input::StyleSheet for Theme {
             Form::Simple => text_input::Appearance {
                 icon_color: color::GREY_7,
                 background: iced::Background::Color(iced::Color::TRANSPARENT),
-                border_radius: 25.0,
-                border_width: 1.0,
-                border_color: color::GREY_7,
+                border: iced::Border {
+                    color: color::GREY_7,
+                    width: 1.0,
+                    radius: 25.0.into(),
+                },
             },
             Form::Invalid => text_input::Appearance {
                 icon_color: color::GREY_7,
                 background: iced::Background::Color(iced::Color::TRANSPARENT),
-                border_radius: 25.0,
-                border_width: 1.0,
-                border_color: color::RED,
+                border: iced::Border {
+                    color: color::RED,
+                    width: 1.0,
+                    radius: 25.0.into(),
+                },
             },
         }
     }
@@ -729,7 +860,7 @@ impl progress_bar::StyleSheet for Theme {
         progress_bar::Appearance {
             background: color::GREY_6.into(),
             bar: color::GREEN.into(),
-            border_radius: 10.0,
+            border_radius: 10.0.into(),
         }
     }
 }
@@ -746,7 +877,7 @@ impl slider::StyleSheet for Theme {
         let handle = slider::Handle {
             shape: slider::HandleShape::Rectangle {
                 width: 8,
-                border_radius: 4.0,
+                border_radius: 4.0.into(),
             },
             color: color::BLACK,
             border_color: color::GREEN,
@@ -755,6 +886,7 @@ impl slider::StyleSheet for Theme {
         slider::Appearance {
             rail: slider::Rail {
                 colors: (color::GREEN, iced::Color::TRANSPARENT),
+                border_radius: 4.0.into(),
                 width: 2.0,
             },
             handle,
@@ -764,7 +896,7 @@ impl slider::StyleSheet for Theme {
         let handle = slider::Handle {
             shape: slider::HandleShape::Rectangle {
                 width: 8,
-                border_radius: 4.0,
+                border_radius: 4.0.into(),
             },
             color: color::GREEN,
             border_color: color::GREEN,
@@ -773,6 +905,7 @@ impl slider::StyleSheet for Theme {
         slider::Appearance {
             rail: slider::Rail {
                 colors: (color::GREEN, iced::Color::TRANSPARENT),
+                border_radius: 4.0.into(),
                 width: 2.0,
             },
             handle,
@@ -782,7 +915,7 @@ impl slider::StyleSheet for Theme {
         let handle = slider::Handle {
             shape: slider::HandleShape::Rectangle {
                 width: 8,
-                border_radius: 4.0,
+                border_radius: 4.0.into(),
             },
             color: color::GREEN,
             border_color: color::GREEN,
@@ -791,6 +924,7 @@ impl slider::StyleSheet for Theme {
         slider::Appearance {
             rail: slider::Rail {
                 colors: (color::GREEN, iced::Color::TRANSPARENT),
+                border_radius: 4.0.into(),
                 width: 2.0,
             },
             handle,
@@ -810,3 +944,13 @@ impl svg::StyleSheet for Theme {
         svg::Appearance::default()
     }
 }
+
+impl qr_code::StyleSheet for Theme {
+    type Style = ();
+    fn appearance(&self, _style: &Self::Style) -> qr_code::Appearance {
+        qr_code::Appearance {
+            cell: color::BLACK,
+            background: color::WHITE,
+        }
+    }
+}
diff --git a/gui/ui/src/util.rs b/gui/ui/src/util.rs
deleted file mode 100644
index 2553c2c92..000000000
--- a/gui/ui/src/util.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-/// from hecjr idea on Discord
-use crate::widget::*;
-
-pub trait Collection<'a, Message>: Sized {
-    fn push(self, element: impl Into<Element<'a, Message>>) -> Self;
-
-    fn push_maybe(self, element: Option<impl Into<Element<'a, Message>>>) -> Self {
-        match element {
-            Some(element) => self.push(element),
-            None => self,
-        }
-    }
-}
-
-impl<'a, Message> Collection<'a, Message> for Column<'a, Message> {
-    fn push(self, element: impl Into<Element<'a, Message>>) -> Self {
-        Self::push(self, element)
-    }
-}
-
-impl<'a, Message> Collection<'a, Message> for Row<'a, Message> {
-    fn push(self, element: impl Into<Element<'a, Message>>) -> Self {
-        Self::push(self, element)
-    }
-}