Merge pull request #22 from ParadiseSS13/master

Merge from Master
Icon Fixes
Merge pull request #82 from Fox-McCloud/sprite-fixes

Sprite fixes