David Lynch:
	- Change icon generation
	- Fix nil error in waypoints
