Added icon support, bug fixes

Added support for icons, only tested on Windows.  Also fixed the new map
bug with the inspector (not tested).