Adds icon_emoji and icon_url support and removes whitespace

I was only supposed to add icon support but SL3 decided that I also wanted to remove the whitespace that was lying around. Let me know if you want to separate this into two different commits.