Use more precise icon for amenity=drinking_water
Use another icon for spring; could still be better
Rework and extend infrastructure category

- Add water subcategory with well, water tower, wastewater plant and
  water works
- Add power subcategory with substation, transformer, plant and
  generator
- Add communications category, with comm. towers