Put the icons right (updates #79)