Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 16054)
+++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 16055)
@@ -35,7 +35,7 @@
 import java.util.Base64;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.EnumMap;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -1513,5 +1513,7 @@
          * Exclude tagging preset icons for {@linkplain OsmPrimitiveType#WAY ways}.
          */
-        NO_WAY_PRESETS,
+        NO_WAY_PRESETS;
+
+        private static final Collection<GetPaddedOptions> DEFAULT = Collections.singleton(GetPaddedOptions.NO_WAY_PRESETS);
     }
 
@@ -1525,5 +1527,5 @@
      */
     public static ImageIcon getPadded(OsmPrimitive primitive, Dimension iconSize) {
-        return getPadded(primitive, iconSize, EnumSet.of(GetPaddedOptions.NO_WAY_PRESETS));
+        return getPadded(primitive, iconSize, GetPaddedOptions.DEFAULT);
     }