--- trunk/src/map-tool.c	2009/11/22 20:39:46	203
+++ trunk/src/map-tool.c	2009/11/23 20:12:22	205
@@ -156,20 +156,27 @@
   int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
 
   GdkPixbuf *icon = icon_get(type, cache->type);
+  GdkPixbuf *over = NULL;
 
+  if(cache->mine)                   over = icon_get(type, 14);
+  else if(cache->found)             over = icon_get(type, 12);
+  else if(cache->notes) {
+    if(cache->notes->found)         over = icon_get(type, 12);
+    else if(cache->notes->override) over = icon_get(type, 11);
+    else                            over = icon_get(type, 13);
+  }
+
+  pos_t *pos = &cache->pos;
   /* check if there's also an overwritten coordinate */
-  if(cache->notes && cache->notes->override) {
-    GdkPixbuf *over = icon_get(type, 11);
+  if(cache->notes && cache->notes->override) 
+    pos = &cache->notes->pos;
 
+  if(!isnan(pos->lat) && !isnan(pos->lon)) {
     osm_gps_map_add_image(OSM_GPS_MAP(map), 
-	  cache->notes->pos.lat, cache->notes->pos.lon, icon);
-
-    osm_gps_map_add_image(OSM_GPS_MAP(map),
-	  cache->notes->pos.lat, cache->notes->pos.lon, over);
-  } else {
-    if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))
-      osm_gps_map_add_image(OSM_GPS_MAP(map), 
-			    cache->pos.lat, cache->pos.lon, icon);
+			  pos->lat, pos->lon, icon);
+    if(over)
+      osm_gps_map_add_image(OSM_GPS_MAP(map),
+			    pos->lat, pos->lon, over);
   }
 }