Bug 1054578: Don't use temporary files when possible. Make sure and package the right icons.
Merge pull request #1591 from Mossop/bug1054578

Bug 1054578: Don't use temporary files when possible. r=gozala