Better emoji UX
Merge pull request #599 from aesedepece/emoji-UX

Better emoji UX