Index: trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java	(revision 4834)
+++ trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java	(revision 4835)
@@ -26,4 +26,5 @@
     private ShowHideButtonListener listener;
     private boolean hideIfDisabled=false;
+    private boolean hiddenByDefault;
 
     /**
@@ -31,5 +32,13 @@
      */
     public IconToggleButton(Action action) {
+        this(action, false);
+    }
+
+    /**
+     * Construct the toggle button with the given action.
+     */
+    public IconToggleButton(Action action, boolean hiddenByDefault) {
         super(action);
+        this.hiddenByDefault = hiddenByDefault;
         setText(null);
 
@@ -79,5 +88,5 @@
     public void applyButtonHiddenPreferences() {
         boolean alwaysHideDisabled = Main.pref.getBoolean("sidetoolbar.hideDisabledButtons", false);
-        boolean hiddenFlag = Main.pref.getBoolean(getPreferenceKey(), false);
+        boolean hiddenFlag = Main.pref.getBoolean(getPreferenceKey(), hiddenByDefault);
         if (!isEnabled() && (hideIfDisabled || alwaysHideDisabled)) 
                 setVisible(false);  // hide because of disabled button 
Index: trunk/src/org/openstreetmap/josm/gui/MapFrame.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 4834)
+++ trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 4835)
@@ -145,7 +145,7 @@
         addMapMode(new IconToggleButton(new DrawAction(this)));
         addMapMode(new IconToggleButton(new ZoomAction(this)));
-        addMapMode(new IconToggleButton(new DeleteAction(this)));
-        addMapMode(new IconToggleButton(new ExtrudeAction(this)));
-        addMapMode(new IconToggleButton(new ParallelWayAction(this)));
+        addMapMode(new IconToggleButton(new DeleteAction(this), !Main.pref.getBoolean("expert", false)));
+        addMapMode(new IconToggleButton(new ExtrudeAction(this), !Main.pref.getBoolean("expert", false)));
+        addMapMode(new IconToggleButton(new ParallelWayAction(this), !Main.pref.getBoolean("expert", false)));
 
         toolGroup.setSelected(((AbstractButton)toolBarActions.getComponent(0)).getModel(), true);