Icon added (may be changed again if I have time)
Merge remote-tracking branch 'origin/master'