Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetType.java	(revision 9614)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetType.java	(revision 9615)
@@ -19,5 +19,5 @@
     CLOSEDWAY(/* ICON */ "Mf_closedway", "closedway"),
     /** Multipolygon */
-    MULTIPOLYGON(/* ICON */ "multipoly_create", "multipolygon"); // FIXME find a better multipolygon icon
+    MULTIPOLYGON(/* ICON */ "Mf_multipolygon", "multipolygon");
     private final String iconName;
     private final String name;
Index: trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java	(revision 9614)
+++ trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java	(revision 9615)
@@ -94,6 +94,6 @@
         private String lang;
         private List<String> projections;
-        private Map<String, List<String> > noTileHeaders;
-        private Map<String, List<String> > noTileChecksums;
+        private Map<String, List<String>> noTileHeaders;
+        private Map<String, List<String>> noTileChecksums;
         private Map<String, String> metadataHeaders;