Fixups to icons