diff --git a/src/callback.c b/src/callback.c
index 3d00c1ba..6a2b3339 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -1498,9 +1498,29 @@ void draw_snap_cursor(int what)
     } else { /* Only search for nearest pin if the grid-snap-point has changed */
       find_closest_net_or_symbol_pin(xctx->mousex, xctx->mousey, &x, &y);
     }
-    double points_x[5] = {x, x+snapcursor_size, x, x-snapcursor_size, x};
-    double points_y[5] = {y-snapcursor_size, y, y+snapcursor_size, y, y-snapcursor_size};
-    drawpolygon(xctx->crosshair_layer, NOW, points_x, points_y, 5, 0, 0, 0);
+    /*double points_x[5] = {x, x+snapcursor_size, x, x-snapcursor_size, x};*/
+    /*double points_y[5] = {y-snapcursor_size, y, y+snapcursor_size, y, y-snapcursor_size};*/
+    /*drawpolygon(xctx->crosshair_layer, NOW, points_x, points_y, 5, 0, 0, 0);*/
+    draw_xhair_line(xctx->gc[xctx->crosshair_layer], snapcursor_size,
+        X_TO_SCREEN(x),
+        Y_TO_SCREEN(y) - snapcursor_size,
+        X_TO_SCREEN(x) + snapcursor_size,
+        Y_TO_SCREEN(y));
+    draw_xhair_line(xctx->gc[xctx->crosshair_layer], snapcursor_size,
+        X_TO_SCREEN(x) + snapcursor_size,
+        Y_TO_SCREEN(y),
+        X_TO_SCREEN(x),
+        Y_TO_SCREEN(y) + snapcursor_size);
+    draw_xhair_line(xctx->gc[xctx->crosshair_layer], snapcursor_size,
+        X_TO_SCREEN(x),
+        Y_TO_SCREEN(y) + snapcursor_size,
+        X_TO_SCREEN(x) - snapcursor_size,
+        Y_TO_SCREEN(y));
+    draw_xhair_line(xctx->gc[xctx->crosshair_layer], snapcursor_size,
+        X_TO_SCREEN(x) - snapcursor_size,
+        Y_TO_SCREEN(y),
+        X_TO_SCREEN(x),
+        Y_TO_SCREEN(y) - snapcursor_size);
     xctx->prev_gridx = xctx->mousex_snap;
     xctx->prev_gridy = xctx->mousey_snap;
     xctx->prev_snapx = x;
diff --git a/src/xschem.tcl b/src/xschem.tcl
index fda04474..81739137 100644
--- a/src/xschem.tcl
+++ b/src/xschem.tcl
@@ -9106,7 +9106,7 @@ set_ne ps_page_title 1 ;# add a title in the top left page corner
 set_ne draw_crosshair 0
 set_ne crosshair_layer 8 ;# Yellow
 set_ne crosshair_size 0
-set_ne snap_cursor_size 3
+set_ne snap_cursor_size 6
 set_ne ps_paper_size {a4 842 595}
 set_ne transparent_svg 0
 set_ne only_probes 0  ; # 20110112