Fixed some issues with icon generation.