Show emoji in more places

:christmas_tree: Follow on from #843 :gift: