More sprite mismatch fixes
Merge pull request #138 from lukecampbell/1548style-r2

OOIION-1548 More sprite mismatch fixes R2