diff -urd -X freeciv.current/diff_ignore freeciv.current/client/climisc.c work/client/climisc.c
--- freeciv.current/client/climisc.c	Wed Aug 29 13:53:14 2001
+++ work/client/climisc.c	Wed Aug 29 15:34:57 2001
@@ -484,8 +484,6 @@
 **************************************************************************/
 enum color_std get_grid_color(int x1, int y1, int x2, int y2)
 {
-  enum city_tile_type city_tile_type1, city_tile_type2;
-  struct city *dummy_pcity;
   int pos1_is_in_city_radius =
       player_in_city_radius(game.player_ptr, x1, y1);
   int pos2_is_in_city_radius = 0;
@@ -505,15 +503,7 @@
   if (!pos1_is_in_city_radius && !pos2_is_in_city_radius) {
     return COLOR_STD_BLACK;
   }
-
-  get_worker_on_map_position(x1, y1, &city_tile_type1, &dummy_pcity);
-  get_worker_on_map_position(x2, y2, &city_tile_type2, &dummy_pcity);
-
-  if (city_tile_type1 == C_TILE_WORKER || city_tile_type2 == C_TILE_WORKER) {
-    return COLOR_STD_RED;
-  } else {
-    return COLOR_STD_WHITE;
-  }
+  return COLOR_STD_WHITE;
 }
 
 /**************************************************************************
diff -urd -X freeciv.current/diff_ignore freeciv.current/client/gui-gtk/mapview.c work/client/gui-gtk/mapview.c
--- freeciv.current/client/gui-gtk/mapview.c	Wed Aug 29 14:50:02 2001
+++ work/client/gui-gtk/mapview.c	Wed Aug 29 15:36:52 2001
@@ -183,6 +183,19 @@
     }
 
     if (draw_map_grid && !citymode) {
+      enum city_tile_type city_tile_type1;
+      struct city *dummy_pcity;
+
+      get_worker_on_map_position(x, y, &city_tile_type1, &dummy_pcity);
+
+      if (city_tile_type1 == C_TILE_WORKER) {
+	  gdk_gc_set_foreground(fill_bg_gc, colors_standard[COLOR_STD_RED]);
+
+	  gdk_draw_rectangle(pm, fill_bg_gc, FALSE,
+			     canvas_x+1, canvas_y+1,
+			     NORMAL_TILE_WIDTH-2, NORMAL_TILE_HEIGHT-2);
+      }
+
       /* left side... */
       gdk_gc_set_foreground(civ_gc,
 			    colors_standard[get_grid_color