#662 Clean up some of the emoticons shortcuts