Index: trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java	(revision 16826)
+++ trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java	(revision 16827)
@@ -261,5 +261,5 @@
                     tr("Overwrite"), tr("Cancel"))
                 .setContent(tr("File exists. Overwrite?"))
-                .setButtonIcons("save_as", "cancel")
+                .setButtonIcons("save", "cancel")
                 .showDialog()
                 .getValue() == 1;
Index: trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 16826)
+++ trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 16827)
@@ -66,5 +66,5 @@
         super(
                 tr("Show Status Report"),
-                "clock",
+                "misc/statusreport",
                 tr("Show status report with useful information that can be attached to bugs"),
                 Shortcut.registerShortcut("help:showstatusreport", tr("Help: {0}",
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 16826)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 16827)
@@ -540,5 +540,5 @@
                         g.setColor(c);
                     }
-                    g.fillOval(x, y + 1, getIconWidth(), getIconHeight() - 2);
+                    g.fillOval(x, y + 2, getIconWidth(), getIconHeight() - 3);
                 }
                 super.paintIcon(comp, g, x, y);
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertFromMarkerLayerAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertFromMarkerLayerAction.java	(revision 16826)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertFromMarkerLayerAction.java	(revision 16827)
@@ -51,5 +51,5 @@
                 }
             } else {
-                Logging.warn("Invalid gpx.to-osm-mapping Einstein setting: expecting even number of entries");
+                Logging.warn("Invalid gpx.to-osm-mapping advanced setting: expecting even number of entries");
             }
             ds.addPrimitive(node);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java	(revision 16826)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java	(revision 16827)
@@ -111,8 +111,8 @@
         m.put("colormode.heatmap.colormap", 0);
         m.put("colormode.heatmap.gain", 0);
-        m.put("colormode.heatmap.line-extra", false); //Einstein only
+        m.put("colormode.heatmap.line-extra", false); //Expert mode only
         m.put("colormode.heatmap.lower-limit", 0);
         m.put("colormode.heatmap.use-points", false);
-        m.put("colormode.time.min-distance", 60); //Einstein only
+        m.put("colormode.time.min-distance", 60); //Expert mode only
         m.put("colormode.velocity.tune", 45);
         m.put("lines", -1);
@@ -131,6 +131,6 @@
         m.put("points.hdopcircle", false);
         m.put("points.large", false);
-        m.put("points.large.alpha", -1); //Einstein only
-        m.put("points.large.size", 3); //Einstein only
+        m.put("points.large.alpha", -1); //Expert mode only
+        m.put("points.large.size", 3); //Expert mode only
         return Collections.unmodifiableMap(m);
     }