finishing off icon renaming, hopefully #2310