Current: When you choose an emoticon in the comment then it is not always displayed correctly.
Try on your site and use the "thumbs up" emoticon in both the main and the comment. In the main post it is correctly displayed and in the comment it uses the :p lus1:
Expected: Same approach to be used in comments as in main emoticons selection.
