Cleaned up loading of SVG FIP images.
Merge pull request #1330 from pjackson28/master

Cleaned up loading of SVG FIP images.