User icon usurps user work
Merge branch 'master' into heroku