Refactored loading textures in MapDisplayGameState so they are cached.
Added new program icons.
Fixed merge conflict.