diff --git a/modules/skin/default/gtk2client.rc b/modules/skin/default/gtk2client.rc
index 713a4f58..aabe929b 100644
--- a/modules/skin/default/gtk2client.rc
+++ b/modules/skin/default/gtk2client.rc
@@ -54,7 +54,6 @@ style "decoration" {
     ythickness = 2
     font_name = "Sans Bold 8"
     GtkButton::default_border = { 5, 0, 5, 0 }
-    GtkWidget::focus_padding = 100
     GtkButton::child_displacement_x = 1
     GtkButton::child_displacement_y = 1
 }
diff --git a/modules/skin/default/gtk2client.ui b/modules/skin/default/gtk2client.ui
index b681d74d..f8e349e4 100644
--- a/modules/skin/default/gtk2client.ui
+++ b/modules/skin/default/gtk2client.ui
@@ -100,7 +100,7 @@ vbox=>
     boxed=,,,,caption,>
 	hbox=,,0,-1
 	    label=1,1,,,title,
-	    button_hide=,,20,20,decoration,x
+	    button_hide=,,20,20,decoration,X
 	    tooltip=Hide this window
 	leave=<
     leave=<
@@ -120,7 +120,7 @@ vbox=>
     boxed=,,,,caption,>
 	hbox=,,0,-1
 	    label=2,1,,,title,
-	    button_hide=,,20,20,decoration,x
+	    button_hide=,,20,20,decoration,X
 	    tooltip=Hide this window
 	leave=<hbox
     leave=<boxed
@@ -166,7 +166,7 @@ vbox=>
     boxed=,,,,caption,>
 	hbox=,,0,-1
 	    label=2,1,,,title,
-	    button_hide=,,20,20,decoration,x
+	    button_hide=,,20,20,decoration,X
 	    tooltip=Close this window
 	leave=<hbox
     leave=<boxed
@@ -194,7 +194,7 @@ vbox=>
     boxed=,,,,caption,>
 	hbox=,,0,-1
 	    label=2,1,,,title,
-	    button_hide=,,20,20,decoration,x
+	    button_hide=,,20,20,decoration,X
 	    tooltip=Hide this window
 	leave=<hbox
     leave=<boxed