Icon generation fixes.