Index: trunk/geticons.pl
===================================================================
--- trunk/geticons.pl	(revision 13280)
+++ trunk/geticons.pl	(revision 13281)
@@ -69,9 +69,4 @@
         ++$icons{$i};
       }
-      if($l =~ /createPreferenceTab\(\"(.*?)\"/)
-      {
-        my $i = "preferences/$1";
-        ++$icons{$i};
-      }
       if($l =~ /setIcon\(\"(.*?)\"/)
       {
@@ -89,9 +84,4 @@
         ++$icons{$i};
       }
-      if($l =~ /ImageProvider\.overlay\(.*?,\s*\"(.*?)\",/)
-      {
-        my $i = $1;
-        ++$icons{$i};
-      }
       if($l =~ /getCursor\(\"(.*?)\",\s*\"(.*?)\"/)
       {
@@ -106,9 +96,4 @@
         ++$icons{$i};
       }
-      if($l =~ /SideButton*\(\s*(?:mark)?tr\s*\(\s*\".*?\"\s*\)\s*,\s*\"(.*?)\"/)
-      {
-        my $i = "dialogs/$1";
-        ++$icons{$i};
-      }
       if($l =~ /super\(\s*tr\(\".*?\"\),\s*\"(.*?)\"/s)
       {
@@ -119,14 +104,4 @@
       {
         my $i = "$extends$1";
-        ++$icons{$i};
-      }
-      if($l =~ /audiotracericon\",\s*\"(.*?)\"/s)
-      {
-        my $i = "markers/$1";
-        ++$icons{$i};
-      }
-      if($l =~ /\"(.*?)\",\s*parentLayer/s)
-      {
-        my $i = "markers/$1";
         ++$icons{$i};
       }
Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 13280)
+++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 13281)
@@ -378,5 +378,5 @@
         public CombineTracksToSegmentedTrackAction(GpxLayer layer) {
             // FIXME: icon missing, create a new icon for this action
-            //new ImageProvider("gpx_tracks_to_segmented_track").getResource().attachImageIcon(this, true);
+            //new ImageProvider(..."gpx_tracks_to_segmented_track").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Collect segments of all tracks and combine in a single track."));
             putValue(NAME, tr("Combine tracks of this layer"));
@@ -410,5 +410,5 @@
         public SplitTrackSegementsToTracksAction(GpxLayer layer) {
             // FIXME: icon missing, create a new icon for this action
-            //new ImageProvider("gpx_segmented_track_to_tracks").getResource().attachImageIcon(this, true);
+            //new ImageProvider(..."gpx_segmented_track_to_tracks").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Split multiple track segments of one track into multiple tracks."));
             putValue(NAME, tr("Split track segments to tracks"));
@@ -443,5 +443,5 @@
         public SplitTracksToLayersAction(GpxLayer layer) {
             // FIXME: icon missing, create a new icon for this action
-            //new ImageProvider("gpx_split_tracks_to_layers").getResource().attachImageIcon(this, true);
+            //new ImageProvider(..."gpx_split_tracks_to_layers").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Split the tracks of this layer to one new layer each."));
             putValue(NAME, tr("Split tracks to new layers"));
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java	(revision 13280)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java	(revision 13281)
@@ -30,5 +30,5 @@
 
     public AudioMarker(LatLon ll, TemplateEngineDataProvider dataProvider, URL audioUrl, MarkerLayer parentLayer, double time, double offset) {
-        super(ll, dataProvider, "speech", parentLayer, time, offset);
+        super(ll, dataProvider, /* ICON(markers/) */ "speech", parentLayer, time, offset);
         this.audioUrl = audioUrl;
         this.syncOffset = 0.0;
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java	(revision 13280)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java	(revision 13281)
@@ -39,5 +39,5 @@
 
     public ImageMarker(LatLon ll, URL imageUrl, MarkerLayer parentLayer, double time, double offset) {
-        super(ll, "photo", parentLayer, time, offset);
+        super(ll, /* ICON(markers/) */ "photo", parentLayer, time, offset);
         this.imageUrl = imageUrl;
     }
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java	(revision 13280)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java	(revision 13281)
@@ -61,5 +61,5 @@
     private PlayHeadMarker() {
         super(LatLon.ZERO, "",
-                Config.getPref().get("marker.audiotracericon", "audio-tracer"),
+                Config.getPref().get("marker.audiotracericon", /* ICON(markers/) */ "audio-tracer"),
                 null, -1.0, 0.0);
         enabled = Config.getPref().getBoolean("marker.traceaudio", true);
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java	(revision 13280)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java	(revision 13281)
@@ -31,5 +31,5 @@
 
     public WebMarker(LatLon ll, URL webUrl, MarkerLayer parentLayer, double time, double offset) {
-        super(ll, "web", parentLayer, time, offset);
+        super(ll, /* ICON(markers/) */ "web", parentLayer, time, offset);
         CheckParameterUtil.ensureParameterNotNull(webUrl, "webUrl");
         this.webUrl = webUrl;