--- a/Button.st	Tue Sep 08 23:25:58 1998 +0200
+++ b/Button.st	Tue Sep 08 23:35:52 1998 +0200
@@ -1850,8 +1850,10 @@
             ]
         ]
     ].
-    labelOriginY := labelOriginY + 1.
-
+    self class == Button ifTrue:[
+        labelOriginY := labelOriginY + 1.
+        labelOriginX := labelOriginX + 1.
+    ]
     "Modified: 3.3.1997 / 15:56:05 / cg"
 !
 
@@ -1905,7 +1907,7 @@
     "return my preferred extent - this is the minimum size I would like to have"
 
     |extraH extraV oldLogo wActive hActive wPassive hPassive
-     wMax hMax anyLogo|
+     wMax hMax anyLogo ext|
 
     "/ If I have an explicit preferredExtent ..
 
@@ -1956,10 +1958,16 @@
             extraH := extraH + 2. extraV := extraV + 2.
         ].
 
-        ^ (wMax + extraH + 1) @ (hMax + extraV + 2)
+        ext := (wMax + extraH) @ (hMax + extraV)
+    ] ifFalse:[
+        ext := super preferredExtent
     ].
-
-    ^ super preferredExtent + (1@2)
+    (self class == Button) ifTrue:[
+        self is3D ifTrue:[
+            ext := ext + (2@2)
+        ]
+    ].
+    ^ ext
 
     "Modified: / 8.9.1998 / 20:48:43 / cg"
 !
@@ -2043,7 +2051,7 @@
         y := (height - shadowForm height) // 2.
         x := width - shadowForm width - (hSpace // 2).
 
-        level > 0 ifTrue:[
+        (self class == Button and:[level > 0]) ifTrue:[
             x := x - 1.
             y := y - 1
         ].
@@ -2207,5 +2215,5 @@
 !Button class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.96 1998-09-08 21:25:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.97 1998-09-08 21:35:52 cg Exp $'
 ! !