emoticons changed to 32x32. Fixed help.txt and merged assets