diff -r 5d02658c548a -r 7428f8744d87 UIPainter.st
--- a/UIPainter.st	Mon Mar 17 17:31:22 2003 +0100
+++ b/UIPainter.st	Wed Mar 19 09:52:28 2003 +0100
@@ -1706,127 +1706,140 @@
 
     <resource: #menu>
 
-    ^
-     
-       #(#Menu
-          
-           #(
-             #(#MenuItem
-                #label: 'Start'
-                #isButton: true
-                #value: #doStartApplication
-                #activeHelpKey: #testStartApplication
-                #labelImage: #(#ResourceRetriever #Icon #startIcon)
-            )
-             #(#MenuItem
-                #label: ''
-            )
-             #(#MenuItem
-                #label: 'New'
-                #isButton: true
-                #value: #doNew
-                #activeHelpKey: #fileNew
-                #labelImage: #(#ResourceRetriever #Icon #newIcon)
-            )
-             #(#MenuItem
-                #label: 'Load'
-                #isButton: true
-                #value: #doLoad
-                #activeHelpKey: #fileLoad
-                #labelImage: #(#ResourceRetriever #Icon #loadIcon)
-            )
-             #(#MenuItem
-                #label: 'Save'
-                #isButton: true
-                #value: #doSave
-                #activeHelpKey: #fileSave
-                #labelImage: #(#ResourceRetriever #Icon #saveIcon)
-            )
-             #(#MenuItem
-                #label: ''
-            )
-             #(#MenuItem
-                #label: 'Cut'
-                #isButton: true
-                #value: #deleteSelection
-                #activeHelpKey: #editCut
-                #enabled: #valueOfCanCut
-                #labelImage: #(#ResourceRetriever #Icon #cutIcon)
-            )
-             #(#MenuItem
-                #label: 'Copy'
-                #isButton: true
-                #value: #copySelection
-                #activeHelpKey: #editCopy
-                #enabled: #valueOfCanCopy
-                #labelImage: #(#ResourceRetriever #Icon #copyIcon)
-            )
-             #(#MenuItem
-                #label: 'Paste With Layout'
-                #isButton: true
-                #value: #pasteWithLayout
-                #activeHelpKey: #editPaste
-                #enabled: #valueOfCanPasteWithKeepingLayout
-                #labelImage: #(#ResourceRetriever #Icon #pasteIcon)
-            )
-             #(#MenuItem
-                #label: 'Delete'
-                #isButton: true
-                #value: #deleteTotalSelection
-                #activeHelpKey: #editDelete
-                #enabled: #valueOfCanCut
-                #labelImage: #(#ResourceRetriever #Icon #deleteIcon)
-            )
-             #(#MenuItem
-                #label: ''
-            )
-             #(#MenuItem
-                #label: 'Move Up'
-                #isButton: true
-                #value: #doStepUp
-                #activeHelpKey: #moveWidgetUp
-                #enabled: #canChangeOrderInContainer
-                #labelImage: #(#ResourceRetriever #Icon #upIcon)
-            )
-             #(#MenuItem
-                #label: 'Move Down'
-                #isButton: true
-                #value: #doStepDown
-                #activeHelpKey: #moveWidgetDown
-                #enabled: #canChangeOrderInContainer
-                #labelImage: #(#ResourceRetriever #Icon #downIcon)
-            )
-             #(#MenuItem
-                #label: 'Move Into'
-                #isButton: true
-                #value: #doStepIn
-                #activeHelpKey: #moveWidgetInto
-                #enabled: #canMoveSelectionIntoContainer
-                #labelImage: #(#ResourceRetriever #Icon #downRightIcon)
-            )
-             #(#MenuItem
-                #label: 'Move Out'
-                #isButton: true
-                #value: #doStepOut
-                #activeHelpKey: #moveWidgetOut
-                #enabled: #canMoveSelectionOutOfContainer
-                #labelImage: #(#ResourceRetriever #Icon #leftDownIcon)
-            )
-             #(#MenuItem
-                #label: ''
-            )
-             #(#MenuItem
-                #label: 'Canvas'
-                #activeHelpKey: #settingsCanvas
-                #indication: #painterShown
-            )
-             #(#MenuItem
-                #label: 'Gallery'
-                #activeHelpKey: #settingsGallery
-                #indication: #galleryShown
-            )
-          ) nil
-          nil
+    ^ 
+     #(#Menu
+        #(
+         #(#MenuItem
+            #activeHelpKey: #testStartApplication
+            #label: 'Start'
+            #itemValue: #doStartApplication
+            #translateLabel: true
+            #isButton: true
+            #labelImage: #(#ResourceRetriever #ToolbarIconLibrary #start22x22Icon)
+          )
+         #(#MenuItem
+            #label: ''
+          )
+         #(#MenuItem
+            #activeHelpKey: #fileNew
+            #label: 'New'
+            #itemValue: #doNew
+            #translateLabel: true
+            #isButton: true
+            #labelImage: #(#ResourceRetriever #ToolbarIconLibrary #newWindowSpec24x24Icon)
+          )
+         #(#MenuItem
+            #activeHelpKey: #fileLoad
+            #label: 'Load'
+            #itemValue: #doLoad
+            #translateLabel: true
+            #isButton: true
+            #labelImage: #(#ResourceRetriever #ToolbarIconLibrary #load22x22Icon)
+          )
+         #(#MenuItem
+            #activeHelpKey: #fileSave
+            #label: 'Save'
+            #itemValue: #doSave
+            #translateLabel: true
+            #isButton: true
+            #labelImage: #(#ResourceRetriever #ToolbarIconLibrary #save22x22Icon)
+          )
+         #(#MenuItem
+            #label: ''
+          )
+         #(#MenuItem
+            #activeHelpKey: #editCut
+            #enabled: #valueOfCanCut
+            #label: 'Cut'
+            #itemValue: #deleteSelection
+            #translateLabel: true
+            #isButton: true
+            #labelImage: #(#ResourceRetriever #ToolbarIconLibrary #cut22x22Icon)
+          )
+         #(#MenuItem
+            #activeHelpKey: #editCopy
+            #enabled: #valueOfCanCopy
+            #label: 'Copy'
+            #itemValue: #copySelection
+            #translateLabel: true
+            #isButton: true
+            #labelImage: #(#ResourceRetriever #ToolbarIconLibrary #copy22x22Icon)
+          )
+         #(#MenuItem
+            #activeHelpKey: #editPaste
+            #enabled: #valueOfCanPasteWithKeepingLayout
+            #label: 'Paste With Layout'
+            #itemValue: #pasteWithLayout
+            #translateLabel: true
+            #isButton: true
+            #labelImage: #(#ResourceRetriever #ToolbarIconLibrary #paste22x22Icon)
+          )
+         #(#MenuItem
+            #activeHelpKey: #editDelete
+            #enabled: #valueOfCanCut
+            #label: 'Delete'
+            #itemValue: #deleteTotalSelection
+            #translateLabel: true
+            #isButton: true
+            #labelImage: #(#ResourceRetriever #ToolbarIconLibrary #delete22x22Icon)
+          )
+         #(#MenuItem
+            #label: ''
+          )
+         #(#MenuItem
+            #activeHelpKey: #moveWidgetUp
+            #enabled: #canChangeOrderInContainer
+            #label: 'Move Up'
+            #itemValue: #doStepUp
+            #translateLabel: true
+            #isButton: true
+            #labelImage: #(#ResourceRetriever #ToolbarIconLibrary #up22x22Icon)
+          )
+         #(#MenuItem
+            #activeHelpKey: #moveWidgetDown
+            #enabled: #canChangeOrderInContainer
+            #label: 'Move Down'
+            #itemValue: #doStepDown
+            #translateLabel: true
+            #isButton: true
+            #labelImage: #(#ResourceRetriever #ToolbarIconLibrary #down22x22Icon)
+          )
+         #(#MenuItem
+            #activeHelpKey: #moveWidgetInto
+            #enabled: #canMoveSelectionIntoContainer
+            #label: 'Move Into'
+            #itemValue: #doStepIn
+            #translateLabel: true
+            #isButton: true
+            #labelImage: #(#ResourceRetriever #ToolbarIconLibrary #downRight22x22Icon)
+          )
+         #(#MenuItem
+            #activeHelpKey: #moveWidgetOut
+            #enabled: #canMoveSelectionOutOfContainer
+            #label: 'Move Out'
+            #itemValue: #doStepOut
+            #translateLabel: true
+            #isButton: true
+            #labelImage: #(#ResourceRetriever #ToolbarIconLibrary #leftDown22x22Icon)
+          )
+         #(#MenuItem
+            #label: ''
+          )
+         #(#MenuItem
+            #activeHelpKey: #settingsCanvas
+            #label: 'Canvas'
+            #translateLabel: true
+            #indication: #painterShown
+          )
+         #(#MenuItem
+            #activeHelpKey: #settingsGallery
+            #label: 'Gallery'
+            #translateLabel: true
+            #indication: #galleryShown
+          )
+         )
+        nil
+        nil
       )
 !