Set Icon / GeometryType for null values in XML

Corrected another quick review, minor corrections

Did NOT update all Icons, will do that another time