Fix #596
Merge pull request #597 from aesedepece/dev

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

Better emoji UX
Revert #588 because of being not protocol-agnostic, sorry.
Merge pull request #601 from aesedepece/revert-588

Revert #588 because of being not protocol-agnostic, sorry.