Add other upmixes for keys that have way too many synonyms

* Alphabetize final target
* Alphabetize uniques
* Add `@icon` to uniques... this should prevent multiple icon values from being downloaded to save user bandwidth

Applies to #232