Index: applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java
===================================================================
--- applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java	(revision 26146)
+++ applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java	(revision 26147)
@@ -74,6 +74,7 @@
   {
     super(tr("Create Stops from GTFS ..."), null,
-      tr("Create Stops from a GTFS file"), null, true);
+      tr("Create Stops from a GTFS file"), null, false);
       putValue("toolbar", "publictransport/gtfsimporter");
+      Main.toolbar.register(this);
   }
 
Index: applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java
===================================================================
--- applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java	(revision 26146)
+++ applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java	(revision 26147)
@@ -416,6 +416,7 @@
   public RoutePatternAction() {
     super(tr("Route patterns ..."), null,
-      tr("Edit Route patterns for public transport"), null, true);
+      tr("Edit Route patterns for public transport"), null, false);
     putValue("toolbar", "publictransport/routepattern");
+    Main.toolbar.register(this);
   }
 
Index: applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java
===================================================================
--- applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java	(revision 26146)
+++ applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java	(revision 26147)
@@ -73,6 +73,7 @@
   {
     super(tr("Create Stops from GPX ..."), null,
-      tr("Create Stops from a GPX file"), null, true);
+      tr("Create Stops from a GPX file"), null, false);
     putValue("toolbar", "publictransport/stopimporter");
+    Main.toolbar.register(this);
   }
 
@@ -113,5 +114,5 @@
       if (curDir.equals(""))
       {
-    curDir = ".";
+        curDir = ".";
       }
       JFileChooser fc = new JFileChooser(new File(curDir));
@@ -121,8 +122,8 @@
       int answer = fc.showOpenDialog(Main.parent);
       if (answer != JFileChooser.APPROVE_OPTION)
-    return;
+        return;
 
       if (!fc.getCurrentDirectory().getAbsolutePath().equals(curDir))
-    Main.pref.put("lastDirectory", fc.getCurrentDirectory().getAbsolutePath());
+        Main.pref.put("lastDirectory", fc.getCurrentDirectory().getAbsolutePath());
 
       importData(fc.getSelectedFile());
@@ -133,20 +134,20 @@
     {
       if ((!inEvent) && (dialog.gpsTimeStartValid()) && (currentTrack != null))
-    Main.main.undoRedo.add(new TrackStoplistRelocateCommand(this));
+      Main.main.undoRedo.add(new TrackStoplistRelocateCommand(this));
     }
     else if ("stopImporter.settingsStopwatchStart".equals(event.getActionCommand()))
     {
       if ((!inEvent) && (dialog.stopwatchStartValid()) && (currentTrack != null))
-    Main.main.undoRedo.add(new TrackStoplistRelocateCommand(this));
+      Main.main.undoRedo.add(new TrackStoplistRelocateCommand(this));
     }
     else if ("stopImporter.settingsTimeWindow".equals(event.getActionCommand()))
     {
       if (currentTrack != null)
-    currentTrack.timeWindow = dialog.getTimeWindow();
+      currentTrack.timeWindow = dialog.getTimeWindow();
     }
     else if ("stopImporter.settingsThreshold".equals(event.getActionCommand()))
     {
       if (currentTrack != null)
-    currentTrack.threshold = dialog.getThreshold();
+        currentTrack.threshold = dialog.getThreshold();
     }
     else if ("stopImporter.settingsSuggestStops".equals(event.getActionCommand()))
@@ -194,16 +195,16 @@
       InputStream is;
       if (file.getName().endsWith(".gpx.gz"))
-    is = new GZIPInputStream(new FileInputStream(file));
+        is = new GZIPInputStream(new FileInputStream(file));
       else
-    is = new FileInputStream(file);
+        is = new FileInputStream(file);
       // Workaround for SAX BOM bug
       // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6206835
       if (!((is.read() == 0xef) && (is.read() == 0xbb) && (is.read() == 0xbf)))
       {
-    is.close();
-    if (file.getName().endsWith(".gpx.gz"))
-      is = new GZIPInputStream(new FileInputStream(file));
-    else
-      is = new FileInputStream(file);
+        is.close();
+        if (file.getName().endsWith(".gpx.gz"))
+          is = new GZIPInputStream(new FileInputStream(file));
+        else
+          is = new FileInputStream(file);
       }
       final GpxReader r = new GpxReader(is);
@@ -213,5 +214,5 @@
       if (!parsedProperly)
       {
-    JOptionPane.showMessageDialog(null, tr("Error occured while parsing gpx file {0}. Only part of the file will be available", file.getName()));
+        JOptionPane.showMessageDialog(null, tr("Error occured while parsing gpx file {0}. Only part of the file will be available", file.getName()));
       }
     }
@@ -242,6 +243,6 @@
       while (trackIter.hasNext())
       {
-    GpxTrack track = trackIter.next();
-    trackRefs.add(new TrackReference(track, this));
+        GpxTrack track = trackIter.next();
+        trackRefs.add(new TrackReference(track, this));
       }
 
@@ -250,5 +251,5 @@
       Iterator< TrackReference > iter = trackRefs.iterator();
       while (iter.hasNext())
-    tracksListModel.addElement(iter.next());
+        tracksListModel.addElement(iter.next());
 
       waypointTM = new WaypointTableModel(this);
@@ -256,6 +257,6 @@
       while (waypointIter.hasNext())
       {
-    WayPoint waypoint = waypointIter.next();
-    waypointTM.addRow(waypoint);
+        WayPoint waypoint = waypointIter.next();
+        waypointTM.addRow(waypoint);
       }
       dialog.setWaypointsTableModel(waypointTM);
@@ -435,11 +436,11 @@
       public void actionPerformed(ActionEvent e)
       {
-    JTable table = dialog.getWaypointsTable();
-    int row = table.getEditingRow();
-    if (row < 0)
-      return;
-    table.clearSelection();
-    table.addRowSelectionInterval(row, row);
-    Main.main.undoRedo.add
+        JTable table = dialog.getWaypointsTable();
+        int row = table.getEditingRow();
+        if (row < 0)
+          return;
+        table.clearSelection();
+        table.addRowSelectionInterval(row, row);
+        Main.main.undoRedo.add
         (new WaypointsDisableCommand(StopImporterAction.this));
       }
@@ -484,10 +485,10 @@
       int row = table.getEditingRow();
       if (row < 0)
-    row = 0;
+        row = 0;
       waypointTM.inEvent = true;
       if (table.getCellEditor() != null)
       {
-    if (!table.getCellEditor().stopCellEditing())
-      table.getCellEditor().cancelCellEditing();
+        if (!table.getCellEditor().stopCellEditing())
+          table.getCellEditor().cancelCellEditing();
       }
       table.editCellAt(row, 1);
@@ -514,10 +515,10 @@
       int row = table.getEditingRow();
       if (row < 0)
-    row = 0;
+        row = 0;
       waypointTM.inEvent = true;
       if (table.getCellEditor() != null)
       {
-    if (!table.getCellEditor().stopCellEditing())
-      table.getCellEditor().cancelCellEditing();
+        if (!table.getCellEditor().stopCellEditing())
+          table.getCellEditor().cancelCellEditing();
       }
       table.editCellAt(row, 2);
@@ -537,10 +538,10 @@
       int row = table.getEditingRow();
       if (row < 0)
-    row = 0;
+        row = 0;
       currentTrack.inEvent = true;
       if (table.getCellEditor() != null)
       {
-    if (!table.getCellEditor().stopCellEditing())
-      table.getCellEditor().cancelCellEditing();
+        if (!table.getCellEditor().stopCellEditing())
+          table.getCellEditor().cancelCellEditing();
       }
       table.editCellAt(row, 1);
@@ -567,10 +568,10 @@
       int row = table.getEditingRow();
       if (row < 0)
-    row = 0;
+        row = 0;
       currentTrack.inEvent = true;
       if (table.getCellEditor() != null)
       {
-    if (!table.getCellEditor().stopCellEditing())
-      table.getCellEditor().cancelCellEditing();
+        if (!table.getCellEditor().stopCellEditing())
+          table.getCellEditor().cancelCellEditing();
       }
       table.editCellAt(row, 2);