Requires some small tweaks around various places we have icons in
use. In fact, this actually eliminates a lot of the small tweaks
in favor of more flexible alignment.