More sprite mismatch fixes
Merge pull request #137 from lukecampbell/1548style

OOIION-1548 More sprite mismatch fixes