Index: gtk/gtkstyle.c
===================================================================
--- gtk/gtkstyle.c	(revision 18287)
+++ gtk/gtkstyle.c	(working copy)
@@ -3645,7 +3645,7 @@ gtk_default_draw_check (GtkStyle      *s
   
   exterior_size = MIN (width, height);
   if (exterior_size % 2 == 0) /* Ensure odd */
-    exterior_size -= -1;
+    exterior_size -= 1;
 
   pad = style->xthickness + MAX (1, (exterior_size - 2 * style->xthickness) / 9);
   interior_size = MAX (1, exterior_size - 2 * pad);
@@ -3768,7 +3768,7 @@ gtk_default_draw_option (GtkStyle      *
   
   exterior_size = MIN (width, height);
   if (exterior_size % 2 == 0) /* Ensure odd */
-    exterior_size -= -1;
+    exterior_size -= 1;
   
   x -= (1 + exterior_size - width) / 2;
   y -= (1 + exterior_size - height) / 2;
Index: gtk/gtkcheckmenuitem.c
===================================================================
--- gtk/gtkcheckmenuitem.c	(revision 18287)
+++ gtk/gtkcheckmenuitem.c	(working copy)
@@ -112,7 +112,7 @@ gtk_check_menu_item_class_init (GtkCheck
                                                              P_("Size of check or radio indicator"),
                                                              0,
                                                              G_MAXINT,
-                                                             12,
+                                                             13,
                                                              GTK_PARAM_READABLE));
 
   widget_class->expose_event = gtk_check_menu_item_expose;
Index: gtk/gtkcellrenderertoggle.c
===================================================================
--- gtk/gtkcellrenderertoggle.c	(revision 18287)
+++ gtk/gtkcellrenderertoggle.c	(working copy)
@@ -71,7 +71,7 @@ enum {
   PROP_INDICATOR_SIZE
 };
 
-#define TOGGLE_WIDTH 12
+#define TOGGLE_WIDTH 13
 
 static guint toggle_cell_signals[LAST_SIGNAL] = { 0 };
 
@@ -376,7 +376,7 @@ gtk_cell_renderer_toggle_render (GtkCell
                         expose_area, widget, "cellradio",
                         cell_area->x + x_offset + cell->xpad,
                         cell_area->y + y_offset + cell->ypad,
-                        width - 1, height - 1);
+                        width, height);
     }
   else
     {
@@ -386,7 +386,7 @@ gtk_cell_renderer_toggle_render (GtkCell
                        expose_area, widget, "cellcheck",
                        cell_area->x + x_offset + cell->xpad,
                        cell_area->y + y_offset + cell->ypad,
-                       width - 1, height - 1);
+                       width, height);
     }
 }
 
