Sprite: Removed border & refactored static code.
(Continuing on issue #466)
Merge pull request #481 from am11/master

Sprite: Removed border & refactored static code