remap icons
less cryptic names, tidying