diff --git a/app/connectionpoint_ops.c b/app/connectionpoint_ops.c
index d507737..b3d0b8b 100644
--- a/app/connectionpoint_ops.c
+++ b/app/connectionpoint_ops.c
@@ -41,15 +41,17 @@ connectionpoint_draw(ConnectionPoint *conpoint,
   
   ddisplay_transform_coords(ddisp, point->x, point->y, &x, &y);
 
-  irenderer->draw_pixel_line (renderer,
-			x-CP_SZ,y-CP_SZ,
-			x+CP_SZ,y+CP_SZ,
+  irenderer->fill_pixel_rect(renderer,
+			x - CONNECTIONPOINT_SIZE/2 + 1,
+			y - CONNECTIONPOINT_SIZE/2 + 1,
+			CONNECTIONPOINT_SIZE-2, CONNECTIONPOINT_SIZE-2,
 			color);
 
-  irenderer->draw_pixel_line (renderer,
-			x+CP_SZ,y-CP_SZ,
-			x-CP_SZ,y+CP_SZ,
-			color);
+  irenderer->draw_pixel_rect(renderer,
+			x - CONNECTIONPOINT_SIZE/2,
+			y - CONNECTIONPOINT_SIZE/2,
+			CONNECTIONPOINT_SIZE-1, CONNECTIONPOINT_SIZE-1,
+			&color_white);
 }
 
 void 
diff --git a/app/handle_ops.c b/app/handle_ops.c
index 54a9b97..03fe31d 100644
--- a/app/handle_ops.c
+++ b/app/handle_ops.c
@@ -22,7 +22,7 @@
 #include "color.h"
 
 /* This value is best left odd so that the handles are centered. */
-#define HANDLE_SIZE 7
+#define HANDLE_SIZE 9
 
 static const Color handle_color[NUM_HANDLE_TYPES<<1] =
 {