First iteration of a launcher icon.
Merge remote-tracking branch 'upstream/master'