Bug 1037338 - Follow-up, safeguard icon generation r=crdlc