Another fix of broken icons. Various rare waterways fixes.