diff --git a/ChangeLog b/ChangeLog
index a79639771..84bf30b82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-03-21 12:27-EDT Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Panels/English.lproj/GSToolbarCustomizationPalette.gorm: Added
+	size: method to class in gorm file.  Added connection to size: method
+	from the switch.
+	* Source/GSToolbarCustomizationPalette.m: Added size: method 
+	implementation.
+	* Source/NSToolbar.m: Added code to save and load sizeMode attribute
+	for toolbar.
+
 2009-03-21 12:13-EDT Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Panels/English.lproj/GSToolbarCustomizationPalette.gorm: Changed
diff --git a/Panels/English.lproj/GSToolbarCustomizationPalette.gorm/data.classes b/Panels/English.lproj/GSToolbarCustomizationPalette.gorm/data.classes
index e8aad1625..521ee79fa 100644
--- a/Panels/English.lproj/GSToolbarCustomizationPalette.gorm/data.classes
+++ b/Panels/English.lproj/GSToolbarCustomizationPalette.gorm/data.classes
@@ -2,6 +2,7 @@
     "## Comment" = "Do NOT change this file, Gorm maintains it";
     FirstResponder = {
 	Actions = (
+	    "size:",
 	    "reset:",
 	    "show:"
 	);
@@ -10,7 +11,8 @@
     GSToolbarCustomizationPalette = {
 	Actions = (
 	    "show:",
-	    "reset:"
+	    "reset:",
+	    "size:"
 	);
 	Outlets = (
 	    _customizationWindow,
diff --git a/Panels/English.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm b/Panels/English.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
index e93ff73c6..5351f6158 100644
Binary files a/Panels/English.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm and b/Panels/English.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm differ
diff --git a/Source/GSToolbarCustomizationPalette.m b/Source/GSToolbarCustomizationPalette.m
index 18de6f7ce..55c05a386 100644
--- a/Source/GSToolbarCustomizationPalette.m
+++ b/Source/GSToolbarCustomizationPalette.m
@@ -303,6 +303,19 @@
   [_toolbar _resetConfig];
 }
 
+- (void) size: (id) sender
+{
+  NSToolbarSizeMode mode = NSToolbarSizeModeRegular;
+
+  if([sender state] == NSOnState)
+    {
+      mode = NSToolbarSizeModeSmall;
+    }
+
+  [_toolbar setSizeMode: mode];
+  [_toolbar _saveConfig];
+}
+
 - (void) paletteDidEnd: (NSNotification *)notif
 {
   [_toolbar _setCustomizationPaletteIsRunning: NO];
diff --git a/Source/NSToolbar.m b/Source/NSToolbar.m
index d1fc25033..da305ca17 100644
--- a/Source/NSToolbar.m
+++ b/Source/NSToolbar.m
@@ -899,11 +899,14 @@ static GSValidationCenter *vc = nil;
     [NSString stringWithFormat: @"NSToolbar Config %@",_identifier];
   NSDictionary *config = [defaults objectForKey: tableKey];
   NSToolbarDisplayMode displayMode = 0;
+  NSToolbarSizeMode sizeMode = 0;
 
   if(config)
     {
       displayMode = (NSToolbarDisplayMode)[[config objectForKey: @"displayMode"] intValue];
       [self setDisplayMode: displayMode];
+      sizeMode = (NSToolbarDisplayMode)[[config objectForKey: @"sizeMode"] intValue];
+      [self setSizeMode: sizeMode];
     }
 
   // Switch off toolbar view reload
@@ -1022,6 +1025,7 @@ static GSValidationCenter *vc = nil;
 
       [config setObject: [NSNumber numberWithBool: _visible] forKey: @"isVisible"];
       [config setObject: [NSNumber numberWithInt: _displayMode] forKey: @"displayMode"];
+      [config setObject: [NSNumber numberWithInt: _sizeMode] forKey: @"sizeMode"];
       while((item = [en nextObject]) != nil)
 	{
 	  [items addObject: [item itemIdentifier]];