adds icon beside the user's name
Merge remote-tracking branch 'origin/master'