Index: test/org/openstreetmap/josm/gui/annotation/AnnotationPresetTest.java
===================================================================
--- test/org/openstreetmap/josm/gui/annotation/AnnotationPresetTest.java	(revision 242)
+++ test/org/openstreetmap/josm/gui/annotation/AnnotationPresetTest.java	(revision 255)
@@ -1,4 +1,5 @@
 package org.openstreetmap.josm.gui.annotation;
 
+import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.lang.reflect.Field;
@@ -6,4 +7,5 @@
 
 import javax.swing.Action;
+import javax.swing.Icon;
 
 import junit.framework.TestCase;
@@ -14,4 +16,5 @@
 import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Label;
 import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Text;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 public class AnnotationPresetTest extends TestCase {
@@ -55,3 +58,15 @@
 		assertEquals("highway", key.value);
 	}
+	
+	public void testIconLoadsFromClasspath() throws Exception {
+		String xml = "<annotations><item icon='logo'></item></annotations>";
+		List<AnnotationPreset> all = AnnotationPreset.readAll(new ByteArrayInputStream(xml.getBytes()));
+
+		assertEquals(1, all.size());
+
+		Icon icon = (Icon)all.get(0).getValue(Action.SMALL_ICON);
+		assertNotNull(icon);
+		assertEquals("Icon loaded and of correct size", 
+				24, Math.max(icon.getIconHeight(), icon.getIconWidth()));
+    }
 }