Undo last commit, reuse canvas when generating icon.

That last commit was really just because it was inefficient.