Adding icons... and some other stuff.

I should commit things right after I change stuff, and not 9 hours
later.