diff --git a/src/org/openstreetmap/josm/gui/IconToggleButton.java b/src/org/openstreetmap/josm/gui/IconToggleButton.java
index 08a37ba..3b564ca 100644
--- a/src/org/openstreetmap/josm/gui/IconToggleButton.java
+++ b/src/org/openstreetmap/josm/gui/IconToggleButton.java
@@ -25,12 +25,21 @@ public class IconToggleButton extends JToggleButton implements HideableButton, P
     public boolean groupbutton;
     private ShowHideButtonListener listener;
     private boolean hideIfDisabled=false;
+    private boolean hiddenByDefault;
 
     /**
      * Construct the toggle button with the given action.
      */
     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);
 
         Object o = action.getValue(Action.SHORT_DESCRIPTION);
@@ -78,7 +87,7 @@ public class IconToggleButton extends JToggleButton implements HideableButton, P
     @Override
     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 
             else 
diff --git a/src/org/openstreetmap/josm/gui/MapFrame.java b/src/org/openstreetmap/josm/gui/MapFrame.java
index b6019d2..a0de622 100644
--- a/src/org/openstreetmap/josm/gui/MapFrame.java
+++ b/src/org/openstreetmap/josm/gui/MapFrame.java
@@ -144,9 +144,9 @@ public class MapFrame extends JPanel implements Destroyable, LayerChangeListener
         addMapMode(new IconToggleButton(new SelectAction(this)));
         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);