Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 33513)
+++ trunk/src/crosshair.c	(revision 33514)
@@ -383,7 +383,7 @@
 		rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
 		pcb_draw_wireframe_line(pcb_crosshair.GC,
 			line.Point1.X, line.Point1.Y, line.Point2.X, line.Point2.Y,
-			line.Thickness + 2 * (conf_core.design.clearance + 1), 0);
+			line.Thickness + 2 * (line.Clearance/2 + 1), 0);
 		rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
 	}
 }
@@ -403,7 +403,7 @@
 	/* Draw the DRC outline if it is enabled */
 	if (conf_core.editor.show_drc) {
 		rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
-		arc.Thickness += 2 * (conf_core.design.clearance + 1);
+		arc.Thickness += 2 * (arc.Clearance/2 + 1);
 		pcb_draw_wireframe_arc(pcb_crosshair.GC, &arc, arc.Thickness);
 		rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
 	}
@@ -436,7 +436,7 @@
 			if (pl->Flags.orient)
 				rnd_poly_contour_inv(pl);
 
-			xordraw_cache.pline = rnd_pline_dup_offset(pl, -conf_core.design.clearance);
+			xordraw_cache.pline = rnd_pline_dup_offset(pl, -(polygon->Clearance/2+1));
 			rnd_poly_contour_del(&pl);
 		}
 		
@@ -490,7 +490,7 @@
 		/* Draw the DRC outline if it is enabled */
 		if (conf_core.editor.show_drc) {
 			rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
-			pcb_draw_wireframe_line(pcb_crosshair.GC,point1->X, point1->Y, point2.X, point2.Y,line->Thickness + 2 * (conf_core.design.clearance + 1), 0);
+			pcb_draw_wireframe_line(pcb_crosshair.GC,point1->X, point1->Y, point2.X, point2.Y,line->Thickness + line->Clearance, 0);
 			rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
 		}
 	}
@@ -536,7 +536,7 @@
 	/* Draw the DRC outline if it is enabled */
 	if (conf_core.editor.show_drc) {
 		rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.drc);
-		arc.Thickness += 2 * (conf_core.design.clearance + 1);
+		arc.Thickness += arc.Clearance;
 		pcb_draw_wireframe_arc(pcb_crosshair.GC, &arc, arc.Thickness);
 		rnd_render->set_color(pcb_crosshair.GC, &conf_core.appearance.color.attached);
 	}
Index: trunk/src/pcb-menu-default.lht
===================================================================
--- trunk/src/pcb-menu-default.lht	(revision 33513)
+++ trunk/src/pcb-menu-default.lht	(revision 33514)
@@ -338,7 +338,7 @@
 						ha:Orthogonal moves                 = { a={<key>m; <key>c; <key>o}; checked=editor/orthogonal_moves; action=conf(toggle, editor/orthogonal_moves, design) }
 						ha:Crosshair snaps to padstacks     = { a={<key>m; <key>c; <key>p}; checked=editor/snap_pin; action=conf(toggle, editor/snap_pin, design) }
 						ha:Crosshair snaps to off-grid points on lines = { a={<key>m; <key>c; <key>s};checked=editor/snap_offgrid_line; action=conf(toggle, editor/snap_offgrid_line, design) }
-						ha:Crosshair shows style clearance  = { a={<key>m; <key>c; <key>c}; checked=editor/show_drc; action=conf(toggle, editor/show_drc, design) }
+						ha:Crosshair shows style/object clearance  = { a={<key>m; <key>c; <key>c}; checked=editor/show_drc; action=conf(toggle, editor/show_drc, design) }
 					}
 				}
 				ha:Drawing {
Index: trunk/src/route.c
===================================================================
--- trunk/src/route.c	(revision 33513)
+++ trunk/src/route.c	(revision 33514)
@@ -757,7 +757,7 @@
  *---------------------------------------------------------*/
 void pcb_route_draw_drc(pcb_route_t *p_route, rnd_hid_gc_t GC)
 {
-	rnd_coord_t thickness = p_route->thickness + 2 * conf_core.design.clearance;
+	rnd_coord_t thickness = p_route->thickness + p_route->clearance;
 	int i;
 
 	rnd_render->set_color(GC, &conf_core.appearance.color.drc);