Fix #4028, Wrong sized overlays on map again

- extended parameters to cover even xxxhdpi
- refactored waypoint markers additionally
Merge branch 'release'