Changed natural=spring icon to amenity_drinking_water icon. Added man_made=water_well icon support.