--- src/themable.h.orig	2005-08-14 22:33:08 +0400
+++ src/themable.h	2005-09-29 17:54:02 +0400
@@ -16,6 +12,8 @@
 XIV(bool, titleBarJoinRight,                    false)
 XIV(bool, showFrameIcon,                        true)
 
+XIV(bool, showButtonBorder,			true)
+
 XIV(int, wsBorderX,                             6)
 XIV(int, wsBorderY,                             6)
 XIV(int, wsDlgBorderX,                          2)
@@ -162,6 +160,8 @@
     OBV("TitleBarJoinRight",                    &titleBarJoinRight,             "Join title*T and title*B"),
     OBV("ShowMenuButtonIcon",                   &showFrameIcon,                 "Show application icon over menu button"),
 
+    OBV("ShowButtonBorder",			&showButtonBorder,			"Show button border"),
+
     OIV("BorderSizeX",                          &wsBorderX, 0, 128,             "Horizontal window border"),
     OIV("BorderSizeY",                          &wsBorderY, 0, 128,             "Vertical window border"),
     OIV("DlgBorderSizeX",                       &wsDlgBorderX, 0, 128,          "Horizontal dialog window border"),
--- src/ybutton.cc.orig	2005-08-14 22:33:08 +0400
+++ src/ybutton.cc	2005-09-29 17:23:12 +0400
@@ -112,8 +112,11 @@
         g.setColor(surface.color);
 
         if (wmLook == lookMetal) {
-            g.drawBorderM(x, y, w - 1, h - 1, !d);
-            d = 0; x += 2; y += 2; w -= 4; h -= 4;
+	    if (showButtonBorder) {
+        	g.drawBorderM(x, y, w - 1, h - 1, !d);
+        	d = 0; x += 2; y += 2; w -= 4; h -= 4;
+	    } else
+		d=0;
         } else if (wmLook == lookGtk) {
             g.drawBorderG(x, y, w - 1, h - 1, !d);
             x += 1 + d; y += 1 + d; w -= 3; h -= 3;
@@ -123,7 +126,8 @@
         }
 
         paint(g, d, YRect(x, y, w, h));
-        paintFocus(g, YRect(x, y, w, h));
+	if (showButtonBorder)
+    	    paintFocus(g, YRect(x, y, w, h));
     }
 }