Emoji improvements

Daniel Brötzmannrequested to merge
emoji-improvements into master

Fixes #10960 (closed)

Edited by Daniel Brötzmann

Merge request reports