Sprites: File nesting, icons, minor tweaks