diff --git a/generic/gtkTtk_RadioButton.cpp b/generic/gtkTtk_RadioButton.cpp
index 1781627..da3467e 100644
--- a/generic/gtkTtk_RadioButton.cpp
+++ b/generic/gtkTtk_RadioButton.cpp
@@ -51,34 +51,29 @@ static void RadioButtonIndicatorElementDraw(
     Drawable d, Ttk_Box b, unsigned state)
 {
     GTKTTK_GTK_DRAWABLE_DEFINITIONS;
-    gint indicator_size, x, y, focus_pad;
+    gint indicator_size, x, y;
     const gint MAGIC_HEIGHT_WIDTH_COMPLEMENT = 40;
     GTKTTK_ENSURE_GTK_STYLE_ENGINE_ACTIVE;
     GtkWidget *widget = GtkTtk_GetRadioButton(wc);
     GTKTTK_ENSURE_WIDGET_OK;
     GTKTTK_DRAWABLE_FROM_WIDGET_SIZE(b.width+MAGIC_HEIGHT_WIDTH_COMPLEMENT,
-				     b.height+MAGIC_HEIGHT_WIDTH_COMPLEMENT);
+				    b.height+MAGIC_HEIGHT_WIDTH_COMPLEMENT);
     GTKTTK_STYLE_BACKGROUND_DEFAULT;
-    GTKTTK_DEFAULT_BACKGROUND_SIZE(b.width+MAGIC_HEIGHT_WIDTH_COMPLEMENT
-				   , b.height+MAGIC_HEIGHT_WIDTH_COMPLEMENT);
+    GTKTTK_DEFAULT_BACKGROUND_SIZE(b.width+MAGIC_HEIGHT_WIDTH_COMPLEMENT,
+                    b.height+MAGIC_HEIGHT_WIDTH_COMPLEMENT);
     GTKTTK_STYLE_FROM_WIDGET;
     GTKTTK_WIDGET_SET_FOCUS(widget);
     GtkTtk_gtk_widget_style_get(widget,
-           "indicator-size", &indicator_size, 
-	   "focus-padding",     &focus_pad, NULL);
+           "indicator-size", &indicator_size, NULL);
     GtkTtk_StateShadowTableLookup(NULL, state, gtkState, gtkShadow,
             GTKTTK_SECTION_BUTTONS|GTKTTK_SECTION_ALL);
-    if (state & TTK_STATE_FOCUS) {
-      GtkTtk_gtk_paint_focus(style, gdkDrawable, gtkState, NULL, widget,
-              "radiobutton", 0, 0, b.width + indicator_size, b.height + indicator_size);
-    }
     // GtkTtk_StateInfo(state, gtkState, gtkShadow, tkwin, widget);
-    x = b.width  - indicator_size / 2;
-    y = b.height - indicator_size / 2 -focus_pad;
+    x = (b.width  - indicator_size) / 2;
+    y = (b.height - indicator_size) / 2;
     GtkTtk_gtk_paint_option(style, gdkDrawable, gtkState, gtkShadow, NULL,
             widget, "radiobutton", x, y, indicator_size, indicator_size);
     GtkTtk_CopyGtkPixmapOnToDrawable(gdkDrawable, d, tkwin,
-            b.width/2, b.height/2, b.width + indicator_size, b.height + indicator_size, b.x, b.y);
+            0, 0, b.width, b.height, b.x, b.y);
     GTKTTK_CLEANUP_GTK_DRAWABLE;
 }