Thanks for the feedback. We ended up separating them again in a new update in response to user feedback. It is worth noting that you are able to still favorite emotes, but you will need to Alt + Click on emotes to favorite them.