diff --git a/ChangeLog b/ChangeLog
index 35719f276..977e096fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-09-06  Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Images/common_Printer.tiff 
+	* Images/common_ToolbarSeperatorItem.tiff
+	* Images/common_ToolbarShowColorsItem.tiff 
+	* Images/common_ToolbarShowFontsItem.tiff
+	* Images/common_ToolbarSpaceItem.tiff 
+	* Source/NSToolbarItem.m: set the correct images and
+	target/action information for all of the standard toolbar items.
+
 2003-09-06  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSMenuItem.m
diff --git a/Images/GNUmakefile b/Images/GNUmakefile
index 9573885ce..982ef4a5a 100644
--- a/Images/GNUmakefile
+++ b/Images/GNUmakefile
@@ -103,7 +103,12 @@ common_RightTabStop.tiff \
 common_CenterTabStop.tiff \
 common_LeftTabStop.tiff \
 common_DecimalTabStop.tiff \
-common_Diamond.tiff
+common_Diamond.tiff \
+common_Printer.tiff \
+common_ToolbarSeperatorItem.tiff \
+common_ToolbarShowColorsItem.tiff \
+common_ToolbarShowFontsItem.tiff \
+common_ToolbarSpaceItem.tiff
 
 -include GNUmakefile.preamble
 
diff --git a/Images/common_Printer.tiff b/Images/common_Printer.tiff
new file mode 100644
index 000000000..8e0b99a56
Binary files /dev/null and b/Images/common_Printer.tiff differ
diff --git a/Images/common_ToolbarSeperatorItem.tiff b/Images/common_ToolbarSeperatorItem.tiff
new file mode 100644
index 000000000..010bdfda1
Binary files /dev/null and b/Images/common_ToolbarSeperatorItem.tiff differ
diff --git a/Images/common_ToolbarShowColorsItem.tiff b/Images/common_ToolbarShowColorsItem.tiff
new file mode 100644
index 000000000..e513bff11
Binary files /dev/null and b/Images/common_ToolbarShowColorsItem.tiff differ
diff --git a/Images/common_ToolbarShowFontsItem.tiff b/Images/common_ToolbarShowFontsItem.tiff
new file mode 100644
index 000000000..c7a77f01d
Binary files /dev/null and b/Images/common_ToolbarShowFontsItem.tiff differ
diff --git a/Images/common_ToolbarSpaceItem.tiff b/Images/common_ToolbarSpaceItem.tiff
new file mode 100644
index 000000000..6103757a6
Binary files /dev/null and b/Images/common_ToolbarSpaceItem.tiff differ
diff --git a/Source/NSToolbarItem.m b/Source/NSToolbarItem.m
index 7c074e1a2..55c07c370 100644
--- a/Source/NSToolbarItem.m
+++ b/Source/NSToolbarItem.m
@@ -267,8 +267,9 @@
 @implementation GSToolbarSeperatorItem
 - (id) initWithItemIdentifier: (NSString *)itemIdentifier
 {
-  NSImage *image = [NSImage imageNamed: @"GSToolbarSeperatorItem"];
+  NSImage *image = [NSImage imageNamed: @"common_ToolbarSeperatorItem"];
   NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
+  [button setBordered: NO];
   [super initWithItemIdentifier: itemIdentifier];
   [self setView: button];
   [self setImage: image];
@@ -285,8 +286,9 @@
 @implementation GSToolbarSpaceItem
 - (id) initWithItemIdentifier: (NSString *)itemIdentifier
 {
-  NSImage *image = [NSImage imageNamed: @"GSToolbarSpaceItem"];
+  NSImage *image = [NSImage imageNamed: @"common_ToolbarSpaceItem"];
   NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
+  [button setBordered: NO];
   [super initWithItemIdentifier: itemIdentifier];
   [self setView: button];
   [self setImage: image];
@@ -303,8 +305,9 @@
 @implementation GSToolbarFlexibleSpaceItem
 - (id) initWithItemIdentifier: (NSString *)itemIdentifier
 {
-  NSImage *image = [NSImage imageNamed: @"GSToolbarFlexibleSpaceItem"];
+  NSImage *image = [NSImage imageNamed: @"common_ToolbarFlexibleSpaceItem"];
   NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
+  [button setBordered: NO];
   [super initWithItemIdentifier: itemIdentifier];
   [self setView: button];
   [self setImage: image];
@@ -321,11 +324,18 @@
 @implementation GSToolbarShowColorsItem
 - (id) initWithItemIdentifier: (NSString *)itemIdentifier
 {
-  NSImage *image = [NSImage imageNamed: @"GSToolbarShowColorsItem"];
+  NSImage *image = [NSImage imageNamed: @"common_ToolbarShowColorsItem"];
   NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
+  [button setBordered: YES];
   [super initWithItemIdentifier: itemIdentifier];
   [self setView: button];
   [self setImage: image];
+
+  // set action...
+  [self setTarget: nil]; // goes to first responder..
+  [self setAction: @selector(orderFrontColorPanel:)];
+
+  // return
   return self;
 }
 @end
@@ -339,11 +349,18 @@
 @implementation GSToolbarShowFontsItem
 - (id) initWithItemIdentifier: (NSString *)itemIdentifier
 {
-  NSImage *image = [NSImage imageNamed: @"GSToolbarShowFontsItem"];
+  NSImage *image = [NSImage imageNamed: @"common_ToolbarShowFontsItem"];
   NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
+  [button setBordered: YES];
   [super initWithItemIdentifier: itemIdentifier];
   [self setView: button];
   [self setImage: image];
+
+  // set action...
+  [self setTarget: nil]; // goes to first responder..
+  [self setAction: @selector(orderFrontFontPanel:)];
+
+  // return
   return self;
 }
 @end
@@ -357,11 +374,18 @@
 @implementation GSToolbarCustomizeToolbarItem
 - (id) initWithItemIdentifier: (NSString *)itemIdentifier
 {
-  NSImage *image = [NSImage imageNamed: @"GSToolbarCustomizeToolbarItem"];
+  NSImage *image = [NSImage imageNamed: @"common_ToolbarCustomizeToolbarItem"];
   NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
+  [button setBordered: YES];
   [super initWithItemIdentifier: itemIdentifier];
   [self setView: button];
   [self setImage: image];
+
+  // set action...
+  [self setTarget: nil]; // goes to first responder..
+  [self setAction: @selector(runCustomizationPalette:)];
+
+  // return
   return self;
 }
 @end
@@ -375,11 +399,18 @@
 @implementation GSToolbarPrintItem
 - (id) initWithItemIdentifier: (NSString *)itemIdentifier
 {
-  NSImage *image = [NSImage imageNamed: @"GSToolbarPrintItem"];
+  NSImage *image = [NSImage imageNamed: @"common_Printer"];
   NSButton *button = [[NSButton alloc] initWithFrame: NSMakeRect(0,0,48,48)];
   [super initWithItemIdentifier: itemIdentifier];
+  [button setBordered: YES];
   [self setView: button];
   [self setImage: image];
+
+  // set action...
+  [self setTarget: nil]; // goes to first responder..
+  [self setAction: @selector(print:)];
+
+  // return
   return self;
 }
 @end