Index: trunk/geticons.pl
===================================================================
--- trunk/geticons.pl	(revision 10565)
+++ trunk/geticons.pl	(revision 10566)
@@ -37,8 +37,5 @@
       if(($l =~ /(?:icon-image|repeat-image|fill-image)\s*:\s*(\"?(.*?)\"?)\s*;/) && ($1 ne "none"))
       {
-        my $val = $2;
-        my $img = "styles/standard/$val";
-        $img = "styles/$val" if((!-f "images/$img") && -f "images/styles/$val");
-        $img = $val if((!-f "images/$img") && -f "images/$val");
+        my $img = $2;
         ++$icons{$img};
       }
@@ -46,5 +43,4 @@
       {
         my $i = $1;
-        $i = "styles/standard/$i" if $i eq "misc/no_icon";
         ++$icons{$i};
       }
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 10565)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 10566)
@@ -165,5 +165,5 @@
      */
     public static ImageIcon getNoIcon_Icon(StyleSource source) {
-        return new ImageProvider("misc/no_icon")
+        return new ImageProvider("presets/misc/no_icon")
                 .setDirs(getIconSourceDirs(source))
                 .setId("mappaint."+source.getPrefName())
@@ -241,6 +241,7 @@
         if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
             /* don't prefix icon path, as it should be generic */
-            dirs.add("resource://images/styles/standard/");
-            dirs.add("resource://images/styles/");
+            dirs.add("resource://images/");
+            // FIXME: WORKAROUND for path change, remove this line in August 2016
+            dirs.add("resource://images/presets/");
         }
 
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 10565)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 10566)
@@ -381,5 +381,5 @@
 way[barrier=retaining_wall],
 way[barrier=kerb] {
-    repeat-image: "misc/cliff-pattern.png";
+    repeat-image: "presets/misc/cliff-pattern.png";
     repeat-image-align: top;
 }
@@ -1392,5 +1392,5 @@
 way[embankment?][!highway][!railway][!waterway],
 way[man_made=embankment][!highway][!railway][!waterway] {
-    repeat-image: "misc/embankment-pattern.png";
+    repeat-image: "presets/misc/embankment-pattern.png";
     repeat-image-align: top;
     width: 1;
@@ -1403,5 +1403,5 @@
 way[man_made=embankment][railway],
 way[man_made=embankment][waterway] {
-    repeat-image: "misc/embankment-pattern-centered.png";
+    repeat-image: "presets/misc/embankment-pattern-centered.png";
 }
 way[man_made=pipeline] {
@@ -1523,89 +1523,89 @@
 }
 node[office=accountant] {
-    icon-image: "presets/styles/standard/office/accountant.svg";
+    icon-image: "presets/office/accountant.svg";
     set icon_z17;
 }
 node[office=administrative] {
-    icon-image: "presets/styles/standard/office/administrative.svg";
+    icon-image: "presets/office/administrative.svg";
     set icon_z17;
 }
 node[office=advertising_agency] {
-    icon-image: "presets/styles/standard/office/advertising_agency.svg";
+    icon-image: "presets/office/advertising_agency.svg";
     set icon_z17;
 }
 node[office=architect] {
-    icon-image: "presets/styles/standard/office/architect.svg";
+    icon-image: "presets/office/architect.svg";
     set icon_z17;
 }
 node[office=association] {
-    icon-image: "presets/styles/standard/office/association.svg";
+    icon-image: "presets/office/association.svg";
     set icon_z17;
 }
 node[office=company] {
-    icon-image: "presets/styles/standard/office/private_company.svg";
+    icon-image: "presets/office/private_company.svg";
     set icon_z17;
 }
 node[office=educational_institution] {
-    icon-image: "presets/styles/standard/office/educational_institution.svg";
+    icon-image: "presets/office/educational_institution.svg";
     set icon_z17;
 }
 node[office=employment_agency] {
-    icon-image: "presets/styles/standard/office/employment_agency.svg";
+    icon-image: "presets/office/employment_agency.svg";
     set icon_z17;
 }
 node[office=estate_agent] {
-    icon-image: "presets/styles/standard/office/real_state.svg";
+    icon-image: "presets/office/real_state.svg";
     set icon_z17;
 }
 node[office=foundation] {
-    icon-image: "presets/styles/standard/office/foundation.svg";
+    icon-image: "presets/office/foundation.svg";
     set icon_z17;
 }
 node[office=insurance] {
-    icon-image: "presets/styles/standard/office/insurance.svg";
+    icon-image: "presets/office/insurance.svg";
     set icon_z17;
 }
 node[office=it] {
-    icon-image: "presets/styles/standard/office/it.svg";
+    icon-image: "presets/office/it.svg";
     set icon_z17;
 }
 node[office=lawyer] {
-    icon-image: "presets/styles/standard/office/lawyer.svg";
+    icon-image: "presets/office/lawyer.svg";
     set icon_z17;
 }
 node[office=newspaper] {
-    icon-image: "presets/styles/standard/office/newspaper.svg";
+    icon-image: "presets/office/newspaper.svg";
     set icon_z17;
 }
 node[office=ngo] {
-    icon-image: "presets/styles/standard/office/ong.svg";
+    icon-image: "presets/office/ong.svg";
     set icon_z17;
 }
 node[office=notary] {
-    icon-image: "presets/styles/standard/office/notary.svg";
+    icon-image: "presets/office/notary.svg";
     set icon_z17;
 }
 node[office=political_party] {
-    icon-image: "presets/styles/standard/office/political_party.svg";
+    icon-image: "presets/office/political_party.svg";
     set icon_z17;
 }
 node[office=religion] {
-    icon-image: "presets/styles/standard/office/religion.svg";
+    icon-image: "presets/office/religion.svg";
     set icon_z17;
 }
 node[office=research] {
-    icon-image: "presets/styles/standard/office/research.svg";
+    icon-image: "presets/office/research.svg";
     set icon_z17;
 }
 node[office=tax_advisor] {
-    icon-image: "presets/styles/standard/office/tax_advisor.svg";
+    icon-image: "presets/office/tax_advisor.svg";
     set icon_z17;
 }
 node[office=telecommunication] {
-    icon-image: "presets/styles/standard/office/telecommunication.svg";
+    icon-image: "presets/office/telecommunication.svg";
     set icon_z17;
 }
 node[office=government] {
-    icon-image: "presets/styles/standard/office/government.svg";
+    icon-image: "presets/office/government.svg";
     set icon_z17;
 }
@@ -4026,5 +4026,5 @@
 }
 way[natural=cliff] {
-    repeat-image: "misc/cliff-pattern.png";
+    repeat-image: "presets/misc/cliff-pattern.png";
     repeat-image-align: top;
     width: 1;