Labelling/icon updates + cleanup
Merge branch 'master' of https://github.com/jonathon-walker/code2day