Fix #1745: Fix Waypoint description overlapping navigation icon