Fix styling of emoticons
Merge branch 'develop'