Merge "Isolate SpriteIcon into its own file."