Bug 1037338 - Follow-up, safeguard icon generation

https://bugzilla.mozilla.org/show_bug.cgi?id=1037338