local changes
changed MapMarker to MapIcon
Integrate new items within aoi_feature_edit