--- toolbar-x.el	10 May 2008 22:03:00 +0200	1.18
+++ toolbar-x.el	14 May 2008 23:12:50 +0200	
@@ -1973,15 +1973,25 @@
 
 
 (defconst toolbarx-default-toolbar-meaning-alist
-  '((separator :image "sep" :command t :enable nil :help "")
-    (open-file :image ["new" toolbar-file-icon]
+  `((separator :image "sep" :command t :enable nil :help "")
+    (new-file :image ["new" toolbar-file-icon]
 	       :command [find-file toolbar-open]
 	       :enable [(not (window-minibuffer-p
 			      (frame-selected-window menu-updating-frame)))
 			t]
+	       :help ["Specify a new file's name, to edit the file" "Visit new file"])
+
+    (open-file :image ["open" toolbar-file-icon]
+	       :command [,(if (fboundp 'menu-find-file-existing)
+			      'menu-find-file-existing
+			    'find-file)
+			 toolbar-open]
+	       :enable [(not (window-minibuffer-p
+			      (frame-selected-window menu-updating-frame)))
+			t]
 	       :help ["Read a file into an Emacs buffer" "Open a file"])
 
-    (dired :image ["open" toolbar-folder-icon]
+    (dired :image ["diropen" toolbar-folder-icon]
 	   :command [dired toolbar-dired]
 	   :help ["Read a directory, operate on its files" "Edit a directory"])