Index: trunk/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java	(revision 14854)
+++ trunk/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java	(revision 14855)
@@ -25,4 +25,6 @@
      */
     public static final IntegerProperty MULTIPLE_NAME_MAX_LENGTH = new IntegerProperty("multiple.name.max.length", 140);
+    private static final String MULTI_CLASS_NAME = "object";
+    private static final Icon MULTI_CLASS_ICON = ImageProvider.get("data", MULTI_CLASS_NAME);
 
     /** The class name of the combined primitives */
@@ -57,5 +59,5 @@
                 multiplePluralClassname = classNamePlural;
             } else if (!multipleClassname.equals(className)) {
-                multipleClassname = "object";
+                multipleClassname = MULTI_CLASS_NAME;
                 multiplePluralClassname = trn("object", "objects", 2);
             }
@@ -65,4 +67,7 @@
             displayName = name;
         } else {
+            if (MULTI_CLASS_NAME.equals(multipleClassname)) {
+                icon = MULTI_CLASS_ICON;
+            }
             StringBuilder sb = new StringBuilder().append(size).append(' ').append(trn(multipleClassname, multiplePluralClassname, size));
             if (multipleName.length() > 0) {
@@ -96,8 +101,5 @@
      */
     public Icon getIcon() {
-        if (size <= 1)
-            return icon;
-        else
-            return ImageProvider.get("data", multipleClassname);
+        return icon;
     }