Index: /trunk/geticons.pl
===================================================================
--- /trunk/geticons.pl	(revision 2810)
+++ /trunk/geticons.pl	(revision 2811)
@@ -55,5 +55,5 @@
         ++$icons{$i};
       }
-      if($l =~ /ImageProvider\.get\(\"(.*?)\",\s+\"(.*?)\"\)/)
+      if($l =~ /ImageProvider\.get\(\"(.*?)\",\s*\"(.*?)\"\s*\)/)
       {
         my $i = "$1/$2";
@@ -61,5 +61,11 @@
         ++$icons{$i};
       }
-      if($l =~ /ImageProvider\.getCursor\(\"(.*?)\",\s+\"(.*?)\"\)/)
+      if($l =~ /ImageProvider\.overlay\(.*?,\s*\"(.*?)\",/)
+      {
+        my $i = $1;
+        $i .= ".png" if !($i =~ /\.png$/);
+        ++$icons{$i};
+      }
+      if($l =~ /getCursor\(\"(.*?)\",\s*\"(.*?)\"/)
       {
         my $i = "cursor/modifier/$2";
@@ -67,4 +73,10 @@
         ++$icons{$i};
         $i = "cursor/$1";
+        $i .= ".png" if !($i =~ /\.png$/);
+        ++$icons{$i};
+      }
+      if($l =~ /ImageProvider\.getCursor\(\"(.*?)\",\s*null\)/)
+      {
+        my $i = "cursor/$1";
         $i .= ".png" if !($i =~ /\.png$/);
         ++$icons{$i};
@@ -76,5 +88,16 @@
         ++$icons{$i};
       }
-
+      if($l =~ /audiotracericon\",\s*\"(.*?)\"/s)
+      {
+        my $i = "markers/$1";
+        $i .= ".png" if !($i =~ /\.png$/);
+        ++$icons{$i};
+      }
+      if($l =~ /\"(.*?)\",\s*parentLayer/s)
+      {
+        my $i = "markers/$1";
+        $i .= ".png" if !($i =~ /\.png$/);
+        ++$icons{$i};
+      }
       if($l =~ /allowedtypes\s+=.*\{(.*)\}/s)
       {
@@ -83,4 +106,20 @@
         {
           ++$icons{"Mf_$1.png"};
+        }
+      }
+      if($l =~ /MODES\s+=.*\{(.*)\}/s)
+      {
+        my $t = $1;
+        while($t =~ /\"(.*?)\"/g)
+        {
+          ++$icons{"dialogs/autoscale/$1.png"};
+        }
+      }
+      if($l =~ /enum\s+DeleteMode\s*\{(.*)/s)
+      {
+        my $t = $1;
+        while($t =~ /\"(.*?)\"/g)
+        {
+          ++$icons{"cursor/modifier/$1.png"};
         }
       }
Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 2810)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 2811)
@@ -148,12 +148,5 @@
         this.offset = offset;
         this.time = time;
-        Icon symbol = ImageProvider.getIfAvailable("markers",iconName);
-        if (symbol == null) {
-            symbol = ImageProvider.getIfAvailable("symbols",iconName);
-        }
-        if (symbol == null) {
-            symbol = ImageProvider.getIfAvailable("nodes",iconName);
-        }
-        this.symbol = symbol;
+        this.symbol = ImageProvider.getIfAvailable("markers",iconName);
         this.parentLayer = parentLayer;
     }