Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 3040)
+++ /trunk/data/defaultpresets.xml	(revision 3041)
@@ -2514,5 +2514,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Fire Hydrant" type="node">
+        <item name="Fire Hydrant" icon="presets/fire_hydrant.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
@@ -2811,5 +2811,5 @@
             <space />
         </item>
-        <item name="Veterinary" icon="presets/empty.png" type="node,closedway">
+        <item name="Veterinary" icon="styles/standard/health/veterinary.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
Index: /trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java	(revision 3040)
+++ /trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java	(revision 3041)
@@ -102,5 +102,8 @@
             }
         } catch (Exception e) {
-            System.err.println(tr("Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file ''{0}''. Exception was: {1}", file.getName(), e.toString(), extension, namepart));
+            if(file.getName().endsWith(".zip")) {
+                System.err.println(tr("Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file ''{0}''. Exception was: {1}",
+                file.getName(), e.toString(), extension, namepart));
+            }
         }
         return res;