Set Icon / GeometryType for null values in XML

Also conducted another quick review, minor corrections

Did NOT update all Icons, will do that another time

This should alleviate the non-issue mentioned today by @csmoore.