Updated Emoticons (needs fixing, codewise).
Backed out of emoticon changes.