Bug 1054578: Don't use temporary files when possible

Also makes sure to package the right icons