diff --git a/ChangeLog b/ChangeLog
index 76ba93928..3028a655b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-19  Sergii Stoian <stoyan255@gmail.com>
+
+	* Source/GSTheme.m (-drawButton:view:style:state:): Call 
+	[drawButton:withClip:] instead of [drawGreyBezel:withClip:] if
+	state is highlighted (e.g. scroller buttons).
+
 2007-01-19  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSPopUpButton.m (-keyDown:): Handle selection of first
diff --git a/Source/GSTheme.m b/Source/GSTheme.m
index 4649e6e25..8ba109df3 100644
--- a/Source/GSTheme.m
+++ b/Source/GSTheme.m
@@ -723,14 +723,10 @@ static NSNull			*null = nil;
       [color set];
       NSRectFill(frame);
 
-      if (state == GSThemeNormalState)
+      if (state == GSThemeNormalState || state == GSThemeHighlightedState)
 	{
 	  [self drawButton: frame withClip: NSZeroRect];
 	}
-      else if (state == GSThemeHighlightedState)
-	{
-	  [self drawGrayBezel: frame withClip: NSZeroRect];
-	}
       else if (state == GSThemeSelectedState)
 	{
 	  [self drawGrayBezel: frame withClip: NSZeroRect];
diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m
index 14a5c7ec8..999bbbe3d 100644
--- a/Source/NSButtonCell.m
+++ b/Source/NSButtonCell.m
@@ -1103,7 +1103,7 @@ typedef struct _GSButtonCellFlags
       case NSNoImage: 
 	imageToDisplay = nil;
 	titleRect = cellFrame;
-	imageRect = NSZeroRect;
+	 imageRect = NSZeroRect;
 	if (titleSize.width + 6 <= titleRect.size.width)
 	  {
 	    titleRect.origin.x += 3;