Update icons from upstream

* Windmill, place of worship, hostel: use new icons.
* Bus station, camping: use icon of more consistent type.
* Cinema, recycling, hairdresser: minor cosmetic changes.

Used upstream icon repository at http://www.sjjb.co.uk/mapicons/contactsheet.
Revert bus station icon
Merge pull request #1034 from math1985/icons

Update icons from upstream