--- a/HierarchicalListEditor.st	Mon Jun 29 16:53:30 1998 +0200
+++ b/HierarchicalListEditor.st	Mon Jun 29 16:59:23 1998 +0200
@@ -461,28 +461,28 @@
                 #value: #doStepUp
                 #activeHelpKey: #editMoveUp
                 #enabled: #canStepOverChannel
-                #labelImage: #(#ResourceRetriever #ToolApplicationModel #upIcon 'Move Up')
+                #labelImage: #(#ResourceRetriever #Icon #upIcon 'Move Up')
             )
              #(#MenuItem
                 #label: 'Move Down'
                 #value: #doStepDown
                 #activeHelpKey: #editMoveDown
                 #enabled: #canStepOverChannel
-                #labelImage: #(#ResourceRetriever #ToolApplicationModel #downIcon 'Move Down')
+                #labelImage: #(#ResourceRetriever #Icon #downIcon 'Move Down')
             )
              #(#MenuItem
                 #label: 'Move In'
                 #value: #doStepIn
                 #activeHelpKey: #editMoveIn
                 #enabled: #canStepInChannel
-                #labelImage: #(#ResourceRetriever #ToolApplicationModel #downRightIcon 'Move In')
+                #labelImage: #(#ResourceRetriever #Icon #downRightIcon 'Move In')
             )
              #(#MenuItem
                 #label: 'Move Out'
                 #value: #doStepOut
                 #activeHelpKey: #editMoveOut
                 #enabled: #canStepOutChannel
-                #labelImage: #(#ResourceRetriever #ToolApplicationModel #leftDownIcon 'Move Out')
+                #labelImage: #(#ResourceRetriever #Icon #leftDownIcon 'Move Out')
             )
           ) nil
           nil
@@ -513,21 +513,21 @@
                 #isButton: true
                 #value: #doNew
                 #activeHelpKey: #fileNew
-                #labelImage: #(#ResourceRetriever nil #newIcon)
+                #labelImage: #(#ResourceRetriever #Icon #newIcon)
             )
              #(#MenuItem
                 #label: 'Load'
                 #isButton: true
                 #value: #doLoad
                 #activeHelpKey: #fileLoad
-                #labelImage: #(#ResourceRetriever nil #loadIcon)
+                #labelImage: #(#ResourceRetriever #Icon #loadIcon)
             )
              #(#MenuItem
                 #label: 'Save'
                 #isButton: true
                 #value: #doSave
                 #activeHelpKey: #fileSave
-                #labelImage: #(#ResourceRetriever nil #saveIcon)
+                #labelImage: #(#ResourceRetriever #Icon #saveIcon)
             )
              #(#MenuItem
                 #label: ''
@@ -538,7 +538,7 @@
                 #value: #doCut
                 #activeHelpKey: #editCut
                 #enabled: #valueOfCanCut
-                #labelImage: #(#ResourceRetriever nil #cutIcon)
+                #labelImage: #(#ResourceRetriever #Icon #cutIcon)
             )
              #(#MenuItem
                 #label: 'Copy'
@@ -546,7 +546,7 @@
                 #value: #doCopy
                 #activeHelpKey: #editCopy
                 #enabled: #valueOfCanCopy
-                #labelImage: #(#ResourceRetriever nil #copyIcon)
+                #labelImage: #(#ResourceRetriever #Icon #copyIcon)
             )
              #(#MenuItem
                 #label: 'Paste'
@@ -554,7 +554,7 @@
                 #value: #doPaste
                 #activeHelpKey: #editPaste
                 #enabled: #valueOfCanPaste
-                #labelImage: #(#ResourceRetriever nil #pasteIcon)
+                #labelImage: #(#ResourceRetriever #Icon #pasteIcon)
             )
              #(#MenuItem
                 #label: 'Delete'
@@ -562,7 +562,7 @@
                 #value: #doDelete
                 #activeHelpKey: #editDelete
                 #enabled: #valueOfCanCut
-                #labelImage: #(#ResourceRetriever nil #deleteIcon)
+                #labelImage: #(#ResourceRetriever #Icon #deleteIcon)
             )
              #(#MenuItem
                 #label: ''
@@ -592,7 +592,7 @@
                 #value: #doStepUp
                 #activeHelpKey: #editMoveUp
                 #enabled: #canStepOverChannel
-                #labelImage: #(#ResourceRetriever nil #upIcon)
+                #labelImage: #(#ResourceRetriever #Icon #upIcon)
             )
              #(#MenuItem
                 #label: 'Move Down'
@@ -600,7 +600,7 @@
                 #value: #doStepDown
                 #activeHelpKey: #editMoveDown
                 #enabled: #canStepOverChannel
-                #labelImage: #(#ResourceRetriever nil #downIcon)
+                #labelImage: #(#ResourceRetriever #Icon #downIcon)
             )
              #(#MenuItem
                 #label: 'Move In'
@@ -608,7 +608,7 @@
                 #value: #doStepIn
                 #activeHelpKey: #editMoveIn
                 #enabled: #canStepInChannel
-                #labelImage: #(#ResourceRetriever nil #downRightIcon)
+                #labelImage: #(#ResourceRetriever #Icon #downRightIcon)
             )
              #(#MenuItem
                 #label: 'Move Out'
@@ -616,7 +616,7 @@
                 #value: #doStepOut
                 #activeHelpKey: #editMoveOut
                 #enabled: #canStepOutChannel
-                #labelImage: #(#ResourceRetriever nil #leftDownIcon)
+                #labelImage: #(#ResourceRetriever #Icon #leftDownIcon)
             )
           ) nil
           nil

--- a/MenuEditor.st	Mon Jun 29 16:53:30 1998 +0200
+++ b/MenuEditor.st	Mon Jun 29 16:59:23 1998 +0200
@@ -1351,32 +1351,32 @@
            #(
              #(#MenuItem
                 #label: 'Cut'
+                #translateLabel: true
                 #value: #doCut
-                #translateLabel: true
                 #activeHelpKey: #editCut
                 #enabled: #hasValidSelection
                 #shortcutKeyCharacter: #Cut
             )
              #(#MenuItem
                 #label: 'Copy'
+                #translateLabel: true
                 #value: #doCopy
-                #translateLabel: true
                 #activeHelpKey: #editCopy
                 #enabled: #hasValidSelection
                 #shortcutKeyCharacter: #Copy
             )
              #(#MenuItem
                 #label: 'Paste'
+                #translateLabel: true
                 #value: #doPaste
-                #translateLabel: true
                 #activeHelpKey: #editPaste
                 #enabled: #valueOfCanPaste
                 #shortcutKeyCharacter: #Paste
             )
              #(#MenuItem
                 #label: 'Delete'
+                #translateLabel: true
                 #value: #doDelete
-                #translateLabel: true
                 #activeHelpKey: #editDelete
                 #enabled: #hasValidSelection
                 #shortcutKeyCharacter: #Delete
@@ -1386,37 +1386,39 @@
             )
              #(#MenuItem
                 #label: 'Move Up'
+                #translateLabel: true
                 #value: #doStepUp
-                #translateLabel: true
                 #activeHelpKey: #editMoveUp
                 #enabled: #valueOfEnableMovingUpOrDown
+                #labelImage: #(#ResourceRetriever #Icon #upIcon 'Move Up')
             )
              #(#MenuItem
                 #label: 'Move Down'
+                #translateLabel: true
                 #value: #doStepDown
-                #translateLabel: true
                 #activeHelpKey: #editMoveDown
                 #enabled: #valueOfEnableMovingUpOrDown
+                #labelImage: #(#ResourceRetriever #Icon #downIcon 'Move Down')
             )
              #(#MenuItem
                 #label: 'Move In'
+                #translateLabel: true
                 #value: #doStepIn
-                #translateLabel: true
                 #activeHelpKey: #editMoveIn
                 #enabled: #valueOfEnableMovingIn
+                #labelImage: #(#ResourceRetriever #Icon #downRightIcon 'Move In')
             )
              #(#MenuItem
                 #label: 'Move Out'
+                #translateLabel: true
                 #value: #doStepOut
-                #translateLabel: true
                 #activeHelpKey: #editMoveOut
                 #enabled: #valueOfEnableMovingOut
+                #labelImage: #(#ResourceRetriever #Icon #leftDownIcon 'Move Out')
             )
           ) nil
           nil
       )
-
-    "Modified: / 20.5.1998 / 00:37:16 / cg"
 !
 
 menuToolbar