Added basic icon
Merge branch 'master' into gameplay