emojis resolved and categorized
Merged 'dev'.
Finish conversation-controls