--- a/ImageEditor.st	Tue Oct 06 09:53:38 2009 +0200
+++ b/ImageEditor.st	Thu Oct 08 10:16:05 2009 +0200
@@ -2689,79 +2689,106 @@
     <resource: #menu>
 
     ^ 
-     #(#Menu
-        #(
-         #(#MenuItem
-            #activeHelpKey: #drawModePoint
-            #enabled: #imageIsLoaded
-            #label: 'Point'
-            #translateLabel: true
-            #choice: #editMode
-            #choiceValue: #point
+     #(Menu
+        (
+         (MenuItem
+            activeHelpKey: drawModePoint
+            enabled: imageIsLoaded
+            label: 'Point'
+            translateLabel: true
+            labelImage: (ResourceRetriever ImageEditor pointIcon 'Point')
+            choice: editMode
+            choiceValue: point
+          )
+         (MenuItem
+            activeHelpKey: drawModePoint
+            enabled: imageIsLoaded
+            label: 'Spray'
+            translateLabel: true
+            labelImage: (ResourceRetriever ImageEditor sprayIcon 'Spray')
+            choice: editMode
+            choiceValue: spray
           )
-         #(#MenuItem
-            #activeHelpKey: #drawModeBox
-            #enabled: #imageIsLoaded
-            #label: 'Rect'
-            #translateLabel: true
-            #choice: #editMode
-            #choiceValue: #box
+         (MenuItem
+            activeHelpKey: drawModeBox
+            enabled: imageIsLoaded
+            label: 'Rect'
+            translateLabel: true
+            labelImage: (ResourceRetriever ImageEditor rectIcon 'Rect')
+            choice: editMode
+            choiceValue: box
           )
-         #(#MenuItem
-            #activeHelpKey: #drawModeFilledBox
-            #enabled: #imageIsLoaded
-            #label: 'Filled Rectangle'
-            #translateLabel: true
-            #choice: #editMode
-            #choiceValue: #filledBox
+         (MenuItem
+            activeHelpKey: drawModeFilledBox
+            enabled: imageIsLoaded
+            label: 'Filled Rectangle'
+            translateLabel: true
+            labelImage: (ResourceRetriever ImageEditor fillRectIcon 'Filled Rectangle')
+            choice: editMode
+            choiceValue: filledBox
           )
-         #(#MenuItem
-            #activeHelpKey: #drawModeFill
-            #enabled: #imageIsLoaded
-            #label: 'Fill'
-            #translateLabel: true
-            #choice: #editMode
-            #choiceValue: #fill
+         (MenuItem
+            activeHelpKey: drawModeBox
+            enabled: imageIsLoaded
+            label: 'Circle'
+            translateLabel: true
+            labelImage: (ResourceRetriever ImageEditor circleIcon 'Circle')
+            choice: editMode
+            choiceValue: circle
           )
-         #(#MenuItem
-            #activeHelpKey: #drawModeCopy
-            #enabled: #imageIsLoaded
-            #label: 'Copy'
-            #translateLabel: true
-            #choice: #editMode
-            #choiceValue: #copy
+         (MenuItem
+            activeHelpKey: drawModeFill
+            enabled: imageIsLoaded
+            label: 'Fill'
+            translateLabel: true
+            labelImage: (ResourceRetriever ImageEditor fillIcon 'Fill')
+            choice: editMode
+            choiceValue: fill
           )
-         #(#MenuItem
-            #activeHelpKey: #drawModePaste
-            #enabled: #imageIsLoaded
-            #label: 'Paste'
-            #translateLabel: true
-            #choice: #editMode
-            #choiceValue: #paste
+         (MenuItem
+            activeHelpKey: drawModeCopy
+            enabled: imageIsLoaded
+            label: 'Copy'
+            translateLabel: true
+            labelImage: (ResourceRetriever ImageEditor copyIcon 'Copy')
+            choice: editMode
+            choiceValue: copy
+          )
+         (MenuItem
+            activeHelpKey: drawModePaste
+            enabled: imageIsLoaded
+            label: 'Paste'
+            translateLabel: true
+            labelImage: (ResourceRetriever ImageEditor pasteIcon 'Paste')
+            choice: editMode
+            choiceValue: paste
           )
-         #(#MenuItem
-            #activeHelpKey: #drawModePasteUnder
-            #enabled: #imageIsLoaded
-            #label: 'Paste Under'
-            #translateLabel: true
-            #choice: #editMode
-            #choiceValue: #pasteUnder
+         (MenuItem
+            activeHelpKey: drawModePasteUnder
+            enabled: imageIsLoaded
+            label: 'Paste Under'
+            translateLabel: true
+            labelImage: (ResourceRetriever ImageEditor pasteUnderIcon 'Paste Under')
+            choice: editMode
+            choiceValue: pasteUnder
           )
-         #(#MenuItem
-            #activeHelpKey: #drawModePasteWithMask
-            #enabled: #imageIsLoaded
-            #label: 'Paste with Mask'
-            #translateLabel: true
-            #choice: #editMode
-            #choiceValue: #pasteWithMask
+         (MenuItem
+            activeHelpKey: drawModePasteWithMask
+            enabled: imageIsLoaded
+            label: 'Paste with Mask'
+            translateLabel: true
+            labelImage: (ResourceRetriever ImageEditor pasteWithMaskIcon 'Paste with Mask')
+            choice: editMode
+            choiceValue: pasteWithMask
           )
-         #(#MenuItem
-            #activeHelpKey: #drawModeSpecial
-            #enabled: #imageIsLoaded
-            #label: 'Special'
-            #translateLabel: true
-            #choice: #editMode
-            #choiceValue: #specialOperation
+         (MenuItem
+            activeHelpKey: drawModeSpecial
+            enabled: imageIsLoaded
+            label: 'Special'
+            translateLabel: true
+            labelImage: (ResourceRetriever ImageEditor specialIcon 'Special')
+            choice: editMode
+            choiceValue: specialOperation
           )
          )
         nil