Removed the old icon handling code.

(I forgot to do this a few commits back).