Update Emote Menu Tabs margin size
Merge remote-tracking branch 'origin/master' into gh-pages