Update hydro and geothermal station icons. Add outline to waterway=dock.
Add icon for leisure=marina+access=private,no
Add icon for waterway=dock