Tweak the icon script, and the generated icons, to more closely