diff --git a/ChangeLog b/ChangeLog
index 8bfa57fbb..879fe3807 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-29 Eric Wasylishen <ewasylishen@gmail.com>
+
+	* Source/GSThemeDrawing.m (-cellForScrollerKnobSlot:): If there are
+	tiles available, set the button cell as bordered so the tiles are
+	used in drawing the scroller slot.
+
 2010-01-29 Eric Wasylishen <ewasylishen@gmail.com>
 
 	* Source/GSTheme.m:
diff --git a/Source/GSThemeDrawing.m b/Source/GSThemeDrawing.m
index c857d4219..b7d6aa0e0 100644
--- a/Source/GSThemeDrawing.m
+++ b/Source/GSThemeDrawing.m
@@ -386,25 +386,29 @@
 
 - (NSCell*) cellForScrollerKnobSlot: (BOOL)horizontal
 {
+  GSDrawTiles   *tiles;
   NSButtonCell	*cell;
   NSColor	*color;
-
-  cell = [NSButtonCell new];
-  [cell setBordered: NO];
-  [cell setTitle: nil];
+  NSString      *name;
 
   if (horizontal)
     {
-      color = [self colorNamed: GSScrollerHorizontalSlot
-			 state: GSThemeNormalState];
-      [self setName: GSScrollerHorizontalSlot forElement: cell temporary: YES];
+      name = GSScrollerHorizontalSlot;
     }
   else
     {
-      color = [self colorNamed: GSScrollerVerticalSlot
-			 state: GSThemeNormalState];
-      [self setName: GSScrollerVerticalSlot forElement: cell temporary: YES];
+      name = GSScrollerVerticalSlot;
     }
+
+  tiles = [self tilesNamed: name state: GSThemeNormalState];
+  color = [self colorNamed: name state: GSThemeNormalState];
+
+  cell = [NSButtonCell new];
+  [cell setBordered: (tiles != nil)];
+  [cell setTitle: nil];
+
+  [self setName: name forElement: cell temporary: YES];
+ 
   if (color == nil)
     {
       color = [NSColor scrollBarColor];