diff --git a/Listeners/Mouse.java b/Listeners/Mouse.java
index bcc0c18..f77a8f6 100644
--- a/Listeners/Mouse.java
+++ b/Listeners/Mouse.java
@@ -71,7 +71,9 @@ public class Mouse extends MouseAdapter
 					{
 						if (SwingUtilities.isRightMouseButton(e))
 						{
-							new WaypointPopup(o);
+							if(o instanceof Waypoint){
+								new WaypointPopup(o);
+							}
 						}
 						if (o == selectedObject)
 						{
diff --git a/images/waypoint.png b/images/waypoint.png
index 14b9b87..39aa230 100644
Binary files a/images/waypoint.png and b/images/waypoint.png differ
diff --git a/images/waypointIcon.png b/images/waypointIcon.png
new file mode 100644
index 0000000..af9ba28
Binary files /dev/null and b/images/waypointIcon.png differ