Show emoji in more places

Follow on from #843
Merge pull request #859 from 24pullrequests/more-emoji

Show emoji in more places