Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 2120)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 2122)
@@ -467,6 +467,5 @@
     }
 
-    private static final String[] deftoolbar = {"open", "save", "exportgpx", "|",
-    "download", "upload", "|", "undo", "redo", "|", "preference"};
+    private static final String[] deftoolbar = {"open", "save", "download", "upload", "|", "undo", "redo", "|", "dialogs/search", "preference", "|", "splitway", "combineway", "wayflip"};
 
     private static Collection<String> getToolString() {