diff --git a/CHANGELOG.md b/CHANGELOG.md
index 138a41d123..0e415104af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,9 @@
 
 ## 🦊 What's Changed 🦊
 
+### Suggest
+- Switched from `unicode-normalization` and `unicase` to ICU4X. (And updated the lock file from ICU4X 1.5 to ICU4X 2.0.)
+
 ### Android
 - Bumped the minimum SDK version to 26 (Android 8). ([#6926](https://github.com/mozilla/application-services/pull/6926)
 
diff --git a/Cargo.lock b/Cargo.lock
index 22fda2aabc..a7f78828b1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2010,17 +2010,28 @@ dependencies = [
 ]
 
 [[package]]
-name = "icu_collections"
-version = "1.5.0"
+name = "icu_casemap"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+checksum = "6dc5e74b3c9d7b63e0d7c5fd54ee8c135705df2ea2aa558082dd555dc9747a97"
 dependencies = [
  "displaydoc",
- "yoke 0.7.5",
- "zerofrom",
- "zerovec 0.10.4",
+ "icu_casemap_data",
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties",
+ "icu_provider",
+ "potential_utf",
+ "writeable",
+ "zerovec",
 ]
 
+[[package]]
+name = "icu_casemap_data"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7584067558ab4c60c95d1ac2abd1588689cb4bcd4e099507f62dae86ae8d2c0"
+
 [[package]]
 name = "icu_collections"
 version = "2.0.0"
@@ -2029,9 +2040,9 @@ checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
 dependencies = [
  "displaydoc",
  "potential_utf",
- "yoke 0.8.0",
+ "yoke",
  "zerofrom",
- "zerovec 0.11.4",
+ "zerovec",
 ]
 
 [[package]]
@@ -2041,13 +2052,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ae5921528335e91da1b6c695dbf1ec37df5ac13faa3f91e5640be93aa2fbefd"
 dependencies = [
  "displaydoc",
- "icu_collections 2.0.0",
+ "icu_collections",
  "icu_locale_core",
  "icu_locale_data",
- "icu_provider 2.0.0",
+ "icu_provider",
  "potential_utf",
- "tinystr 0.8.1",
- "zerovec 0.11.4",
+ "tinystr",
+ "zerovec",
 ]
 
 [[package]]
@@ -2057,10 +2068,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
 dependencies = [
  "displaydoc",
- "litemap 0.8.0",
- "tinystr 0.8.1",
- "writeable 0.6.1",
- "zerovec 0.11.4",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
 ]
 
 [[package]]
@@ -2069,100 +2080,48 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fdef0c124749d06a743c69e938350816554eb63ac979166590e2b4ee4252765"
 
-[[package]]
-name = "icu_locid"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
-dependencies = [
- "displaydoc",
- "litemap 0.7.4",
- "tinystr 0.7.6",
- "writeable 0.5.5",
- "zerovec 0.10.4",
-]
-
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider 1.5.0",
- "tinystr 0.7.6",
- "zerovec 0.10.4",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
 [[package]]
 name = "icu_normalizer"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
 dependencies = [
  "displaydoc",
- "icu_collections 1.5.0",
+ "icu_collections",
  "icu_normalizer_data",
  "icu_properties",
- "icu_provider 1.5.0",
+ "icu_provider",
  "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
- "zerovec 0.10.4",
+ "zerovec",
 ]
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
 
 [[package]]
 name = "icu_properties"
-version = "1.5.1"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
 dependencies = [
  "displaydoc",
- "icu_collections 1.5.0",
- "icu_locid_transform",
+ "icu_collections",
+ "icu_locale_core",
  "icu_properties_data",
- "icu_provider 1.5.0",
- "tinystr 0.7.6",
- "zerovec 0.10.4",
+ "icu_provider",
+ "potential_utf",
+ "zerotrie",
+ "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
-
-[[package]]
-name = "icu_provider"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr 0.7.6",
- "writeable 0.5.5",
- "yoke 0.7.5",
- "zerofrom",
- "zerovec 0.10.4",
-]
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
 
 [[package]]
 name = "icu_provider"
@@ -2173,23 +2132,12 @@ dependencies = [
  "displaydoc",
  "icu_locale_core",
  "stable_deref_trait",
- "tinystr 0.8.1",
- "writeable 0.6.1",
- "yoke 0.8.0",
+ "tinystr",
+ "writeable",
+ "yoke",
  "zerofrom",
  "zerotrie",
- "zerovec 0.11.4",
-]
-
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.89",
+ "zerovec",
 ]
 
 [[package]]
@@ -2200,14 +2148,14 @@ checksum = "e185fc13b6401c138cf40db12b863b35f5edf31b88192a545857b41aeaf7d3d3"
 dependencies = [
  "core_maths",
  "displaydoc",
- "icu_collections 2.0.0",
+ "icu_collections",
  "icu_locale",
  "icu_locale_core",
- "icu_provider 2.0.0",
+ "icu_provider",
  "icu_segmenter_data",
  "potential_utf",
  "utf8_iter",
- "zerovec 0.11.4",
+ "zerovec",
 ]
 
 [[package]]
@@ -2235,9 +2183,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -2541,12 +2489,6 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f508063cc7bb32987c71511216bd5a32be15bccb6a80b52df8b9d7f01fc3aa2"
 
-[[package]]
-name = "litemap"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
-
 [[package]]
 name = "litemap"
 version = "0.8.0"
@@ -3447,7 +3389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
 dependencies = [
  "serde",
- "zerovec 0.11.4",
+ "zerovec",
 ]
 
 [[package]]
@@ -4379,6 +4321,9 @@ dependencies = [
  "expect-test",
  "extend",
  "hex",
+ "icu_casemap",
+ "icu_normalizer",
+ "icu_properties",
  "interrupt-support",
  "itertools 0.14.0",
  "once_cell",
@@ -4392,8 +4337,6 @@ dependencies = [
  "sql-support",
  "tempfile",
  "thiserror 2.0.3",
- "unicase",
- "unicode-normalization",
  "uniffi",
  "url",
  "viaduct",
@@ -4700,16 +4643,6 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
-[[package]]
-name = "tinystr"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
-dependencies = [
- "displaydoc",
- "zerovec 0.10.4",
-]
-
 [[package]]
 name = "tinystr"
 version = "0.8.1"
@@ -4717,7 +4650,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
 dependencies = [
  "displaydoc",
- "zerovec 0.11.4",
+ "zerovec",
 ]
 
 [[package]]
@@ -5201,12 +5134,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -5865,18 +5792,6 @@ dependencies = [
  "bitflags 2.8.0",
 ]
 
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
-[[package]]
-name = "writeable"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
-
 [[package]]
 name = "writeable"
 version = "0.6.1"
@@ -5947,18 +5862,6 @@ dependencies = [
  "linked-hash-map",
 ]
 
-[[package]]
-name = "yoke"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive 0.7.5",
- "zerofrom",
-]
-
 [[package]]
 name = "yoke"
 version = "0.8.0"
@@ -5967,22 +5870,10 @@ checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
 dependencies = [
  "serde",
  "stable_deref_trait",
- "yoke-derive 0.8.0",
+ "yoke-derive",
  "zerofrom",
 ]
 
-[[package]]
-name = "yoke-derive"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.89",
- "synstructure",
-]
-
 [[package]]
 name = "yoke-derive"
 version = "0.8.0"
@@ -6043,17 +5934,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
 dependencies = [
  "displaydoc",
-]
-
-[[package]]
-name = "zerovec"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
-dependencies = [
- "yoke 0.7.5",
+ "yoke",
  "zerofrom",
- "zerovec-derive 0.10.3",
 ]
 
 [[package]]
@@ -6062,20 +5944,9 @@ version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
 dependencies = [
- "yoke 0.8.0",
+ "yoke",
  "zerofrom",
- "zerovec-derive 0.11.1",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.89",
+ "zerovec-derive",
 ]
 
 [[package]]
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
index dfce757202..aab57273ee 100644
--- a/DEPENDENCIES.md
+++ b/DEPENDENCIES.md
@@ -48,7 +48,7 @@ the details of which are reproduced below.
 * [BSD-3-Clause License: bindgen](#bsd-3-clause-license-bindgen)
 * [BSD-3-Clause License: protobuf](#bsd-3-clause-license-protobuf)
 * [Zlib License: foldhash](#zlib-license-foldhash)
-* [Unicode-3.0 License: icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_locid, icu_locid_transform, icu_locid_transform_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_provider_macros, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive](#unicode-30-license-icu_collections-icu_locale-icu_locale_core-icu_locale_data-icu_locid-icu_locid_transform-icu_locid_transform_data-icu_normalizer-icu_normalizer_data-icu_properties-icu_properties_data-icu_provider-icu_provider_macros-icu_segmenter-icu_segmenter_data-litemap-potential_utf-tinystr-writeable-yoke-yoke-derive-zerofrom-zerofrom-derive-zerotrie-zerovec-zerovec-derive)
+* [Unicode-3.0 License: icu_casemap, icu_casemap_data, icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive](#unicode-30-license-icu_casemap-icu_casemap_data-icu_collections-icu_locale-icu_locale_core-icu_locale_data-icu_normalizer-icu_normalizer_data-icu_properties-icu_properties_data-icu_provider-icu_segmenter-icu_segmenter_data-litemap-potential_utf-tinystr-writeable-yoke-yoke-derive-zerofrom-zerofrom-derive-zerotrie-zerovec-zerovec-derive)
 * [OpenSSL License](#openssl-license)
 * [Optional Notice: SQLite](#optional-notice-sqlite)
 * [(Apache-2.0 OR MIT) AND BSD-3-Clause License: encoding_rs](#(apache-20-or-mit)-and-bsd-3-clause-license-encoding_rs)
@@ -588,10 +588,8 @@ The following text applies to code linked from these dependencies:
 [tinyvec_macros](https://github.com/Soveu/tinyvec_macros),
 [toml](https://github.com/alexcrichton/toml-rs),
 [typenum](https://github.com/paholg/typenum),
-[unicase](https://github.com/seanmonstar/unicase),
 [unicode-normalization](https://github.com/unicode-rs/unicode-normalization),
 [url](https://github.com/servo/rust-url),
-[utf16_iter](https://github.com/hsivonen/utf16_iter),
 [utf8_iter](https://github.com/hsivonen/utf8_iter),
 [uuid](https://github.com/uuid-rs/uuid),
 [vcpkg](https://github.com/mcgoo/vcpkg-rs),
@@ -602,8 +600,7 @@ The following text applies to code linked from these dependencies:
 [windows-sys](https://github.com/microsoft/windows-rs),
 [windows-targets](https://github.com/microsoft/windows-rs),
 [windows_x86_64_gnu](https://github.com/microsoft/windows-rs),
-[windows_x86_64_msvc](https://github.com/microsoft/windows-rs),
-[write16](https://github.com/hsivonen/write16)
+[windows_x86_64_msvc](https://github.com/microsoft/windows-rs)
 
 ```
                                  Apache License
@@ -2260,22 +2257,20 @@ the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 ```
 -------------
-## Unicode-3.0 License: icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_locid, icu_locid_transform, icu_locid_transform_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_provider_macros, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive
+## Unicode-3.0 License: icu_casemap, icu_casemap_data, icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive
 
 The following text applies to code linked from these dependencies:
+[icu_casemap](https://github.com/unicode-org/icu4x),
+[icu_casemap_data](https://github.com/unicode-org/icu4x),
 [icu_collections](https://github.com/unicode-org/icu4x),
 [icu_locale](https://github.com/unicode-org/icu4x),
 [icu_locale_core](https://github.com/unicode-org/icu4x),
 [icu_locale_data](https://github.com/unicode-org/icu4x),
-[icu_locid](https://github.com/unicode-org/icu4x),
-[icu_locid_transform](https://github.com/unicode-org/icu4x),
-[icu_locid_transform_data](https://github.com/unicode-org/icu4x),
 [icu_normalizer](https://github.com/unicode-org/icu4x),
 [icu_normalizer_data](https://github.com/unicode-org/icu4x),
 [icu_properties](https://github.com/unicode-org/icu4x),
 [icu_properties_data](https://github.com/unicode-org/icu4x),
 [icu_provider](https://github.com/unicode-org/icu4x),
-[icu_provider_macros](https://github.com/unicode-org/icu4x),
 [icu_segmenter](https://github.com/unicode-org/icu4x),
 [icu_segmenter_data](https://github.com/unicode-org/icu4x),
 [litemap](https://github.com/unicode-org/icu4x),
diff --git a/components/suggest/Cargo.toml b/components/suggest/Cargo.toml
index 28185e88e7..927b82ad77 100644
--- a/components/suggest/Cargo.toml
+++ b/components/suggest/Cargo.toml
@@ -12,6 +12,11 @@ anyhow = "1.0"
 rmp-serde = "1.3"
 chrono = "0.4"
 extend = "1.1"
+icu_casemap = "2"
+# Turn off the default features for icu_normalizer to allow it to be compiled in parallel
+# with icu_properties.
+icu_normalizer = { version = "2", default-features = false, features = ["compiled_data"] }
+icu_properties = "2"
 interrupt-support = { path = "../support/interrupt" }
 once_cell = "1.5"
 parking_lot = ">=0.11,<=0.12"
@@ -24,9 +29,6 @@ sql-support = { path = "../support/sql" }
 viaduct = { path = "../viaduct" }
 tempfile = { version = "3.2.0", optional = true }
 thiserror = "2"
-# This is an old version of `unicase` but it's the one mozilla-central uses.
-unicase = "2.6"
-unicode-normalization = "0.1"
 uniffi = { version = "0.29.0" }
 url = { version = "2.1", features = ["serde"] }
 
diff --git a/components/suggest/src/util.rs b/components/suggest/src/util.rs
index fb9b807d98..a18d424b4d 100644
--- a/components/suggest/src/util.rs
+++ b/components/suggest/src/util.rs
@@ -3,12 +3,24 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+use icu_casemap::CaseMapperBorrowed;
+use icu_normalizer::DecomposingNormalizerBorrowed;
+use icu_properties::props::GeneralCategory;
+use icu_properties::props::GeneralCategoryGroup;
+use icu_properties::CodePointMapDataBorrowed;
 use std::borrow::Cow;
-use unicase::UniCase;
-use unicode_normalization::{char::is_combining_mark, UnicodeNormalization};
 
 use crate::Result;
 
+static NFKD: DecomposingNormalizerBorrowed = DecomposingNormalizerBorrowed::new_nfkd();
+static GENERAL_CATEGORY: CodePointMapDataBorrowed<'static, GeneralCategory> =
+    icu_properties::CodePointMapData::<GeneralCategory>::new();
+static CASE_MAPPER: CaseMapperBorrowed = CaseMapperBorrowed::new();
+
+fn is_combining_mark(c: char) -> bool {
+    GeneralCategoryGroup::Mark.contains(GENERAL_CATEGORY.get(c))
+}
+
 /// Given a list of keywords for a suggestion, returns a phrase that best
 /// completes the user's query. This function uses two heuristics to pick the
 /// best match:
@@ -253,8 +265,12 @@ pub fn split_keyword(keyword: &str) -> (&str, &str) {
 /// Compares two strings ignoring case, Unicode combining marks, and some
 /// punctuation. Intended to be used as a Sqlite collating sequence for
 /// comparing natural language strings like keywords and geoname names.
+///
+/// XXX: Should really be using `icu_collator` for collation!
 pub fn i18n_cmp(a: &str, b: &str) -> std::cmp::Ordering {
-    UniCase::new(i18n_transform(a)).cmp(&UniCase::new(i18n_transform(b)))
+    CASE_MAPPER
+        .fold_string(&i18n_transform(a))
+        .cmp(&CASE_MAPPER.fold_string(&i18n_transform(b)))
 }
 
 /// Performs the following transforms on the given string:
@@ -288,14 +304,17 @@ pub fn i18n_transform(s: &str) -> Cow<'_, str> {
         };
     }
 
-    let borrowable = !s
-        .nfkd()
+    let borrowable = !NFKD
+        .normalize_iter(s.chars())
         .any(|c| is_combining_mark(c) || matches!(c, pattern_all!()));
 
     if borrowable {
+        // XXX: This borrows the non-NFKD form, which sure looks like a bug,
+        // since NFKD can introduce changes that aren't caught by the check
+        // inside `any()` above.
         Cow::from(s)
     } else {
-        s.nfkd()
+        NFKD.normalize_iter(s.chars())
             .filter_map(|c| {
                 if is_combining_mark(c) {
                     // Remove Unicode combining marks:
diff --git a/megazords/full/DEPENDENCIES.md b/megazords/full/DEPENDENCIES.md
index c0c00c3534..671a2cc500 100644
--- a/megazords/full/DEPENDENCIES.md
+++ b/megazords/full/DEPENDENCIES.md
@@ -32,7 +32,7 @@ the details of which are reproduced below.
 * [BSD-2-Clause License: arrayref](#bsd-2-clause-license-arrayref)
 * [BSD-3-Clause License: protobuf](#bsd-3-clause-license-protobuf)
 * [Zlib License: foldhash](#zlib-license-foldhash)
-* [Unicode-3.0 License: icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_locid, icu_locid_transform, icu_locid_transform_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_provider_macros, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive](#unicode-30-license-icu_collections-icu_locale-icu_locale_core-icu_locale_data-icu_locid-icu_locid_transform-icu_locid_transform_data-icu_normalizer-icu_normalizer_data-icu_properties-icu_properties_data-icu_provider-icu_provider_macros-icu_segmenter-icu_segmenter_data-litemap-potential_utf-tinystr-writeable-yoke-yoke-derive-zerofrom-zerofrom-derive-zerotrie-zerovec-zerovec-derive)
+* [Unicode-3.0 License: icu_casemap, icu_casemap_data, icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive](#unicode-30-license-icu_casemap-icu_casemap_data-icu_collections-icu_locale-icu_locale_core-icu_locale_data-icu_normalizer-icu_normalizer_data-icu_properties-icu_properties_data-icu_provider-icu_segmenter-icu_segmenter_data-litemap-potential_utf-tinystr-writeable-yoke-yoke-derive-zerofrom-zerofrom-derive-zerotrie-zerovec-zerovec-derive)
 * [Optional Notice: SQLite](#optional-notice-sqlite)
 * [(MIT OR Apache-2.0) AND Unicode-3.0 License: unicode-ident](#(mit-or-apache-20)-and-unicode-30-license-unicode-ident)
 -------------
@@ -538,10 +538,8 @@ The following text applies to code linked from these dependencies:
 [tinyvec_macros](https://github.com/Soveu/tinyvec_macros),
 [toml](https://github.com/alexcrichton/toml-rs),
 [typenum](https://github.com/paholg/typenum),
-[unicase](https://github.com/seanmonstar/unicase),
 [unicode-normalization](https://github.com/unicode-rs/unicode-normalization),
 [url](https://github.com/servo/rust-url),
-[utf16_iter](https://github.com/hsivonen/utf16_iter),
 [utf8_iter](https://github.com/hsivonen/utf8_iter),
 [uuid](https://github.com/uuid-rs/uuid),
 [vcpkg](https://github.com/mcgoo/vcpkg-rs),
@@ -550,8 +548,7 @@ The following text applies to code linked from these dependencies:
 [windows-sys](https://github.com/microsoft/windows-rs),
 [windows-targets](https://github.com/microsoft/windows-rs),
 [windows_x86_64_gnu](https://github.com/microsoft/windows-rs),
-[windows_x86_64_msvc](https://github.com/microsoft/windows-rs),
-[write16](https://github.com/hsivonen/write16)
+[windows_x86_64_msvc](https://github.com/microsoft/windows-rs)
 
 ```
                                  Apache License
@@ -1720,22 +1717,20 @@ the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 ```
 -------------
-## Unicode-3.0 License: icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_locid, icu_locid_transform, icu_locid_transform_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_provider_macros, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive
+## Unicode-3.0 License: icu_casemap, icu_casemap_data, icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive
 
 The following text applies to code linked from these dependencies:
+[icu_casemap](https://github.com/unicode-org/icu4x),
+[icu_casemap_data](https://github.com/unicode-org/icu4x),
 [icu_collections](https://github.com/unicode-org/icu4x),
 [icu_locale](https://github.com/unicode-org/icu4x),
 [icu_locale_core](https://github.com/unicode-org/icu4x),
 [icu_locale_data](https://github.com/unicode-org/icu4x),
-[icu_locid](https://github.com/unicode-org/icu4x),
-[icu_locid_transform](https://github.com/unicode-org/icu4x),
-[icu_locid_transform_data](https://github.com/unicode-org/icu4x),
 [icu_normalizer](https://github.com/unicode-org/icu4x),
 [icu_normalizer_data](https://github.com/unicode-org/icu4x),
 [icu_properties](https://github.com/unicode-org/icu4x),
 [icu_properties_data](https://github.com/unicode-org/icu4x),
 [icu_provider](https://github.com/unicode-org/icu4x),
-[icu_provider_macros](https://github.com/unicode-org/icu4x),
 [icu_segmenter](https://github.com/unicode-org/icu4x),
 [icu_segmenter_data](https://github.com/unicode-org/icu4x),
 [litemap](https://github.com/unicode-org/icu4x),
diff --git a/megazords/full/android/dependency-licenses.xml b/megazords/full/android/dependency-licenses.xml
index 519428289b..486128a7d2 100644
--- a/megazords/full/android/dependency-licenses.xml
+++ b/megazords/full/android/dependency-licenses.xml
@@ -476,10 +476,6 @@ the details of which are reproduced below.
     <name>Apache License 2.0: typenum</name>
     <url>https://github.com/paholg/typenum/blob/main/LICENSE-APACHE</url>
   </license>
-  <license>
-    <name>Apache License 2.0: unicase</name>
-    <url>https://github.com/seanmonstar/unicase/blob/master/LICENSE-APACHE</url>
-  </license>
   <license>
     <name>Apache License 2.0: unicode-normalization</name>
     <url>https://github.com/unicode-rs/unicode-normalization/blob/master/LICENSE-APACHE</url>
@@ -488,10 +484,6 @@ the details of which are reproduced below.
     <name>Apache License 2.0: url</name>
     <url>https://github.com/servo/rust-url/blob/main/LICENSE-APACHE</url>
   </license>
-  <license>
-    <name>Apache License 2.0: utf16_iter</name>
-    <url>https://github.com/hsivonen/utf16_iter/blob/main/LICENSE-APACHE</url>
-  </license>
   <license>
     <name>Apache License 2.0: utf8_iter</name>
     <url>https://github.com/hsivonen/utf8_iter/blob/main/LICENSE-APACHE</url>
@@ -528,10 +520,6 @@ the details of which are reproduced below.
     <name>Apache License 2.0: windows_x86_64_msvc</name>
     <url>https://github.com/microsoft/windows-rs/blob/master/license-mit</url>
   </license>
-  <license>
-    <name>Apache License 2.0: write16</name>
-    <url>https://github.com/hsivonen/write16/blob/main/LICENSE-APACHE</url>
-  </license>
   <license>
     <name>MIT License: aho-corasick</name>
     <url>https://github.com/BurntSushi/aho-corasick/blob/master/LICENSE-MIT</url>
@@ -669,31 +657,27 @@ the details of which are reproduced below.
     <url>https://github.com/orlp/foldhash/blob/master/LICENSE</url>
   </license>
   <license>
-    <name>Unicode-3.0 License: icu_collections</name>
-    <url>https://github.com/unicode-org/icu4x/blob/main/LICENSE</url>
-  </license>
-  <license>
-    <name>Unicode-3.0 License: icu_locale</name>
+    <name>Unicode-3.0 License: icu_casemap</name>
     <url>https://github.com/unicode-org/icu4x/blob/main/LICENSE</url>
   </license>
   <license>
-    <name>Unicode-3.0 License: icu_locale_core</name>
+    <name>Unicode-3.0 License: icu_casemap_data</name>
     <url>https://github.com/unicode-org/icu4x/blob/main/LICENSE</url>
   </license>
   <license>
-    <name>Unicode-3.0 License: icu_locale_data</name>
+    <name>Unicode-3.0 License: icu_collections</name>
     <url>https://github.com/unicode-org/icu4x/blob/main/LICENSE</url>
   </license>
   <license>
-    <name>Unicode-3.0 License: icu_locid</name>
+    <name>Unicode-3.0 License: icu_locale</name>
     <url>https://github.com/unicode-org/icu4x/blob/main/LICENSE</url>
   </license>
   <license>
-    <name>Unicode-3.0 License: icu_locid_transform</name>
+    <name>Unicode-3.0 License: icu_locale_core</name>
     <url>https://github.com/unicode-org/icu4x/blob/main/LICENSE</url>
   </license>
   <license>
-    <name>Unicode-3.0 License: icu_locid_transform_data</name>
+    <name>Unicode-3.0 License: icu_locale_data</name>
     <url>https://github.com/unicode-org/icu4x/blob/main/LICENSE</url>
   </license>
   <license>
@@ -716,10 +700,6 @@ the details of which are reproduced below.
     <name>Unicode-3.0 License: icu_provider</name>
     <url>https://github.com/unicode-org/icu4x/blob/main/LICENSE</url>
   </license>
-  <license>
-    <name>Unicode-3.0 License: icu_provider_macros</name>
-    <url>https://github.com/unicode-org/icu4x/blob/main/LICENSE</url>
-  </license>
   <license>
     <name>Unicode-3.0 License: icu_segmenter</name>
     <url>https://github.com/unicode-org/icu4x/blob/main/LICENSE</url>
diff --git a/megazords/ios-rust/DEPENDENCIES.md b/megazords/ios-rust/DEPENDENCIES.md
index bb7610b659..3f1002e135 100644
--- a/megazords/ios-rust/DEPENDENCIES.md
+++ b/megazords/ios-rust/DEPENDENCIES.md
@@ -44,7 +44,7 @@ the details of which are reproduced below.
 * [BSD-2-Clause License: arrayref](#bsd-2-clause-license-arrayref)
 * [BSD-3-Clause License: bindgen](#bsd-3-clause-license-bindgen)
 * [Zlib License: foldhash](#zlib-license-foldhash)
-* [Unicode-3.0 License: icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_locid, icu_locid_transform, icu_locid_transform_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_provider_macros, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive](#unicode-30-license-icu_collections-icu_locale-icu_locale_core-icu_locale_data-icu_locid-icu_locid_transform-icu_locid_transform_data-icu_normalizer-icu_normalizer_data-icu_properties-icu_properties_data-icu_provider-icu_provider_macros-icu_segmenter-icu_segmenter_data-litemap-potential_utf-tinystr-writeable-yoke-yoke-derive-zerofrom-zerofrom-derive-zerotrie-zerovec-zerovec-derive)
+* [Unicode-3.0 License: icu_casemap, icu_casemap_data, icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive](#unicode-30-license-icu_casemap-icu_casemap_data-icu_collections-icu_locale-icu_locale_core-icu_locale_data-icu_normalizer-icu_normalizer_data-icu_properties-icu_properties_data-icu_provider-icu_segmenter-icu_segmenter_data-litemap-potential_utf-tinystr-writeable-yoke-yoke-derive-zerofrom-zerofrom-derive-zerotrie-zerovec-zerovec-derive)
 * [Optional Notice: SQLite](#optional-notice-sqlite)
 * [(Apache-2.0 OR MIT) AND BSD-3-Clause License: encoding_rs](#(apache-20-or-mit)-and-bsd-3-clause-license-encoding_rs)
 * [(MIT OR Apache-2.0) AND Unicode-3.0 License: unicode-ident](#(mit-or-apache-20)-and-unicode-30-license-unicode-ident)
@@ -573,15 +573,12 @@ The following text applies to code linked from these dependencies:
 [tinyvec_macros](https://github.com/Soveu/tinyvec_macros),
 [toml](https://github.com/alexcrichton/toml-rs),
 [typenum](https://github.com/paholg/typenum),
-[unicase](https://github.com/seanmonstar/unicase),
 [unicode-normalization](https://github.com/unicode-rs/unicode-normalization),
 [url](https://github.com/servo/rust-url),
-[utf16_iter](https://github.com/hsivonen/utf16_iter),
 [utf8_iter](https://github.com/hsivonen/utf8_iter),
 [uuid](https://github.com/uuid-rs/uuid),
 [vcpkg](https://github.com/mcgoo/vcpkg-rs),
-[version_check](https://github.com/SergioBenitez/version_check),
-[write16](https://github.com/hsivonen/write16)
+[version_check](https://github.com/SergioBenitez/version_check)
 
 ```
                               Apache License
@@ -2119,22 +2116,20 @@ the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 ```
 -------------
-## Unicode-3.0 License: icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_locid, icu_locid_transform, icu_locid_transform_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_provider_macros, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive
+## Unicode-3.0 License: icu_casemap, icu_casemap_data, icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive
 
 The following text applies to code linked from these dependencies:
+[icu_casemap](https://github.com/unicode-org/icu4x),
+[icu_casemap_data](https://github.com/unicode-org/icu4x),
 [icu_collections](https://github.com/unicode-org/icu4x),
 [icu_locale](https://github.com/unicode-org/icu4x),
 [icu_locale_core](https://github.com/unicode-org/icu4x),
 [icu_locale_data](https://github.com/unicode-org/icu4x),
-[icu_locid](https://github.com/unicode-org/icu4x),
-[icu_locid_transform](https://github.com/unicode-org/icu4x),
-[icu_locid_transform_data](https://github.com/unicode-org/icu4x),
 [icu_normalizer](https://github.com/unicode-org/icu4x),
 [icu_normalizer_data](https://github.com/unicode-org/icu4x),
 [icu_properties](https://github.com/unicode-org/icu4x),
 [icu_properties_data](https://github.com/unicode-org/icu4x),
 [icu_provider](https://github.com/unicode-org/icu4x),
-[icu_provider_macros](https://github.com/unicode-org/icu4x),
 [icu_segmenter](https://github.com/unicode-org/icu4x),
 [icu_segmenter_data](https://github.com/unicode-org/icu4x),
 [litemap](https://github.com/unicode-org/icu4x),
diff --git a/megazords/ios-rust/focus/DEPENDENCIES.md b/megazords/ios-rust/focus/DEPENDENCIES.md
index bf79a1b084..8d02825b35 100644
--- a/megazords/ios-rust/focus/DEPENDENCIES.md
+++ b/megazords/ios-rust/focus/DEPENDENCIES.md
@@ -37,7 +37,7 @@ the details of which are reproduced below.
 * [MIT License: weedle2](#mit-license-weedle2)
 * [BSD-2-Clause License: arrayref](#bsd-2-clause-license-arrayref)
 * [Zlib License: foldhash](#zlib-license-foldhash)
-* [Unicode-3.0 License: icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_locid, icu_locid_transform, icu_locid_transform_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_provider_macros, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive](#unicode-30-license-icu_collections-icu_locale-icu_locale_core-icu_locale_data-icu_locid-icu_locid_transform-icu_locid_transform_data-icu_normalizer-icu_normalizer_data-icu_properties-icu_properties_data-icu_provider-icu_provider_macros-icu_segmenter-icu_segmenter_data-litemap-potential_utf-tinystr-writeable-yoke-yoke-derive-zerofrom-zerofrom-derive-zerotrie-zerovec-zerovec-derive)
+* [Unicode-3.0 License: icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive](#unicode-30-license-icu_collections-icu_locale-icu_locale_core-icu_locale_data-icu_normalizer-icu_normalizer_data-icu_properties-icu_properties_data-icu_provider-icu_segmenter-icu_segmenter_data-litemap-potential_utf-tinystr-writeable-yoke-yoke-derive-zerofrom-zerofrom-derive-zerotrie-zerovec-zerovec-derive)
 * [Optional Notice: SQLite](#optional-notice-sqlite)
 * [(Apache-2.0 OR MIT) AND BSD-3-Clause License: encoding_rs](#(apache-20-or-mit)-and-bsd-3-clause-license-encoding_rs)
 * [(MIT OR Apache-2.0) AND Unicode-3.0 License: unicode-ident](#(mit-or-apache-20)-and-unicode-30-license-unicode-ident)
@@ -549,12 +549,10 @@ The following text applies to code linked from these dependencies:
 [toml](https://github.com/alexcrichton/toml-rs),
 [typenum](https://github.com/paholg/typenum),
 [url](https://github.com/servo/rust-url),
-[utf16_iter](https://github.com/hsivonen/utf16_iter),
 [utf8_iter](https://github.com/hsivonen/utf8_iter),
 [uuid](https://github.com/uuid-rs/uuid),
 [vcpkg](https://github.com/mcgoo/vcpkg-rs),
-[version_check](https://github.com/SergioBenitez/version_check),
-[write16](https://github.com/hsivonen/write16)
+[version_check](https://github.com/SergioBenitez/version_check)
 
 ```
                               Apache License
@@ -1708,22 +1706,18 @@ the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 ```
 -------------
-## Unicode-3.0 License: icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_locid, icu_locid_transform, icu_locid_transform_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_provider_macros, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive
+## Unicode-3.0 License: icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive
 
 The following text applies to code linked from these dependencies:
 [icu_collections](https://github.com/unicode-org/icu4x),
 [icu_locale](https://github.com/unicode-org/icu4x),
 [icu_locale_core](https://github.com/unicode-org/icu4x),
 [icu_locale_data](https://github.com/unicode-org/icu4x),
-[icu_locid](https://github.com/unicode-org/icu4x),
-[icu_locid_transform](https://github.com/unicode-org/icu4x),
-[icu_locid_transform_data](https://github.com/unicode-org/icu4x),
 [icu_normalizer](https://github.com/unicode-org/icu4x),
 [icu_normalizer_data](https://github.com/unicode-org/icu4x),
 [icu_properties](https://github.com/unicode-org/icu4x),
 [icu_properties_data](https://github.com/unicode-org/icu4x),
 [icu_provider](https://github.com/unicode-org/icu4x),
-[icu_provider_macros](https://github.com/unicode-org/icu4x),
 [icu_segmenter](https://github.com/unicode-org/icu4x),
 [icu_segmenter_data](https://github.com/unicode-org/icu4x),
 [litemap](https://github.com/unicode-org/icu4x),