Fixes a bunch of sprite mismatches
Merge pull request #105 from lukecampbell/1118sprites-r2

OOIION-1118 Fixes a bunch of sprite mismatches R2