--- a/ColorMenu.st	Sun Jan 27 17:08:51 2008 +0100
+++ b/ColorMenu.st	Mon Feb 04 10:28:12 2008 +0100
@@ -186,7 +186,7 @@
                      ifNone:nil.
 
     item isNil ifTrue:[
-        icon := XPToolbarIconLibrary changesBrowser24x24Icon.
+        icon := ToolbarIconLibrary colorHistory16x16Icon.
         item := MenuItem labeled:icon.
         item nameKey:#userDefined.
         item activeHelpKey:#userDefinedColors.
@@ -267,7 +267,7 @@
             getColSel := aSlice at:2.
             baseColor := Color perform:colorId.
 
-            menuItem label:(Text string:'  ' emphasis:(#backgroundColor->baseColor)).
+            menuItem label:(Text string:' ' emphasis:(#backgroundColor->baseColor)).
             menuItem submenu:(submenu := Menu new).
             menuItem isButton:true.
 
@@ -360,14 +360,16 @@
 
     model notNil ifTrue:[
         model value:aColor.
-        RecentlyUsedColors isNil ifTrue:[
-            RecentlyUsedColors := OrderedCollection new.
-        ].
-        RecentlyUsedColors remove:aColor ifAbsent:[].
-        RecentlyUsedColors addFirst:aColor.
-        RecentlyUsedColors size > 20 ifTrue:[
-            RecentlyUsedColors removeLast
-        ].
+        aColor notNil ifTrue:[
+            RecentlyUsedColors isNil ifTrue:[
+                RecentlyUsedColors := OrderedCollection new.
+            ].
+            RecentlyUsedColors remove:aColor ifAbsent:[].
+            RecentlyUsedColors addFirst:aColor.
+            RecentlyUsedColors size > 20 ifTrue:[
+                RecentlyUsedColors removeLast
+            ].
+        ]
     ]
 ! !
 
@@ -501,7 +503,7 @@
     menu 
         addItem:(
             (MenuItem labeled:nil)
-                labelImage:(ToolbarIconLibrary colorHistory16x16Icon);
+                labelImage:(ToolbarIconLibrary history16x16Icon);
                 submenuChannel:[ self colorHistorySubmenu ]; 
                 nameKey:#seudoHhistory;
                 isButton: false) 
@@ -554,5 +556,5 @@
 !ColorMenu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.42 2008-01-27 16:08:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.43 2008-02-04 09:28:12 cg Exp $'
 ! !