Add more generic presets
Add waterway presets
Add place presets
Add man_made presets
Don't use hand as placeholder icon (#942)