Icons and stuff
Merge branch 'master' into taj