Fix class icons and set default icon to none