--- a/Tools__TextDiff3Tool.st	Thu Jan 17 21:52:18 2013 +0000
+++ b/Tools__TextDiff3Tool.st	Fri Jan 18 00:03:03 2013 +0000
@@ -378,51 +378,65 @@
         (
          (MenuItem
             enabled: canMergeCurrentHolder
-            label: 'Base'
-            itemValue: doMergeGurrentUsingBase
+            label: 'Use Base for Current Delta'
+            itemValue: doMergeCurrentUsingBase
+            isButton: true
+            labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBase24x24)
           )
          (MenuItem
             enabled: canMergeCurrentHolder
-            label: 'A'
-            itemValue: doMergeGurrentUsingA
+            label: 'Use A for Current '
+            itemValue: doMergeCurrentUsingA
+            isButton: true
+            labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingA24x24)
           )
          (MenuItem
             enabled: canMergeCurrentHolder
-            label: 'B'
-            itemValue: doMergeGurrentUsingB
-          )
-         (MenuItem
-            label: '-'
+            label: 'Use B for Current '
+            itemValue: doMergeCurrentUsingB
+            isButton: true
+            labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingB24x24)
           )
          (MenuItem
-            label: 'All Base'
+            label: 'Use Base Everywhere'
             itemValue: doMergeAllUsingBase
+            isButton: true
+            startGroup: right
+            labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBaseAll24x24)
           )
          (MenuItem
-            label: 'All A'
+            label: 'Use A Everywhere'
             itemValue: doMergeAllUsingA
+            isButton: true
+            startGroup: right
+            labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingAAll24x24)
           )
          (MenuItem
-            label: 'All B'
+            label: 'Use Be Everywhere '
             itemValue: doMergeAllUsingB
-          )
-         (MenuItem
-            label: '-'
+            isButton: true
+            labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBAll24x24)
           )
          (MenuItem
             label: 'Auto Merge'
             itemValue: doMergeAllAuto
+            isButton: true
+            startGroup: right
+            labelImage: (ResourceRetriever ToolbarIconLibrary mergeMerge24x24)
           )
          (MenuItem
             label: 'External Merge'
             itemValue: doMergeAllExternal
+            isButton: true
+            startGroup: right
+            labelImage: (ResourceRetriever ToolbarIconLibrary mergeMergeExternal24x24)
           )
          )
         nil
         nil
       )
 
-    "Modified: / 30-11-2012 / 13:53:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 17-01-2013 / 22:31:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !TextDiff3Tool class methodsFor:'plugIn spec'!
@@ -1168,5 +1182,5 @@
 !TextDiff3Tool class methodsFor:'documentation'!
 
 version_SVN
-    ^ '$Id: Tools__TextDiff3Tool.st 8090 2013-01-17 21:52:18Z vranyj1 $'
+    ^ '$Id: Tools__TextDiff3Tool.st 8091 2013-01-18 00:03:03Z vranyj1 $'
 ! !