Add a user-defined literal to grab themed icons and port to use it.

Also some miscellaneous cleanups for whitespace but that's the bulk of
this commit.