Index: trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java	(revision 4171)
+++ trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java	(revision 4172)
@@ -16,5 +16,5 @@
 
     public AddImageryLayerAction(ImageryInfo info) {
-        super(info.getMenuName(), "imagery_menu", tr("Add imagery layer {0}",info.getName()), null, false, false);
+        super(info.getMenuName(), /* ICON */"imagery_menu", tr("Add imagery layer {0}",info.getName()), null, false, false);
         putValue("toolbar", "imagery_" + info.getToolbarName());
         this.info = info;
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java	(revision 4171)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java	(revision 4172)
@@ -8,11 +8,11 @@
 public enum OsmPrimitiveType {
 
-    NODE (marktr("node"), Node.class, NodeData.class),
-    WAY  (marktr("way"), Way.class, WayData.class),
-    RELATION (marktr("relation"), Relation.class, RelationData.class),
+    NODE (marktr(/* ICON(data/) */"node"), Node.class, NodeData.class),
+    WAY  (marktr(/* ICON(data/) */"way"), Way.class, WayData.class),
+    RELATION (marktr(/* ICON(data/) */"relation"), Relation.class, RelationData.class),
 
     /* only for display, no real type */
-    CLOSEDWAY  (marktr("closedway"), null, WayData.class),
-    MULTIPOLYGON (marktr("multipolygon"), null, RelationData.class);
+    CLOSEDWAY  (marktr(/* ICON(data/) */"closedway"), null, WayData.class),
+    MULTIPOLYGON (marktr(/* ICON(data/) */"multipolygon"), null, RelationData.class);
 
     private final String apiTypeName;
Index: trunk/src/org/openstreetmap/josm/data/validation/Severity.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/Severity.java	(revision 4171)
+++ trunk/src/org/openstreetmap/josm/data/validation/Severity.java	(revision 4172)
@@ -12,9 +12,9 @@
 public enum Severity {
     /** Error messages */
-    ERROR(tr("Errors"), "error",       Main.pref.getColor(marktr("validation error"), Color.RED)),
+    ERROR(tr("Errors"), /* ICON(data/) */"error",       Main.pref.getColor(marktr("validation error"), Color.RED)),
     /** Warning messages */
-    WARNING(tr("Warnings"), "warning", Main.pref.getColor(marktr("validation warning"), Color.YELLOW)),
+    WARNING(tr("Warnings"), /* ICON(data/) */"warning", Main.pref.getColor(marktr("validation warning"), Color.YELLOW)),
     /** Other messages */
-    OTHER(tr("Other"), "other",        Main.pref.getColor(marktr("validation other"), Color.CYAN));
+    OTHER(tr("Other"), /* ICON(data/) */"other",        Main.pref.getColor(marktr("validation other"), Color.CYAN));
 
     /** Description of the severity code */
Index: trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java	(revision 4171)
+++ trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java	(revision 4172)
@@ -70,5 +70,5 @@
     Map_Rectifier_WMSmenuAction rectaction = new Map_Rectifier_WMSmenuAction();
     JosmAction blankmenu = new JosmAction(
-            tr("Blank Layer"), "blankmenu", tr("Open a blank WMS layer to load data from a file"), null, false) {
+            tr("Blank Layer"), /* ICON */"blankmenu", tr("Open a blank WMS layer to load data from a file"), null, false) {
         @Override
         public void actionPerformed(ActionEvent ev) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 4171)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 4172)
@@ -1158,5 +1158,5 @@
                             for (URI u : uris) {
                                 conn = (HttpURLConnection) u.toURL().openConnection();
-                                conn.setConnectTimeout(5000);
+                                conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
 
                                 if (conn.getResponseCode() != 200) {
@@ -1171,5 +1171,5 @@
                                             .replaceFirst("/wiki/", "/w/index.php?redirect=no&title=")
                                     ).toURL().openConnection();
-                                    conn.setConnectTimeout(5000);
+                                    conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
 
                                     /* redirect pages have different content length, but retrieving a "nonredirect"
Index: trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java	(revision 4171)
+++ trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java	(revision 4172)
@@ -365,5 +365,5 @@
                     connection = (HttpURLConnection)url.openConnection();
                 }
-                connection.setConnectTimeout(15000);
+                connection.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
                 InputStream inputStream = connection.getInputStream();
                 InputSource inputSource = new InputSource(new InputStreamReader(inputStream, "UTF-8"));
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 4171)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java	(revision 4172)
@@ -179,4 +179,6 @@
         this.offset = offset;
         this.time = time;
+        // /* ICON(markers/) */"Bridge"
+        // /* ICON(markers/) */"Crossing"
         this.symbol = ImageProvider.getIfAvailable("markers",iconName);
         this.parentLayer = parentLayer;
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 4171)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 4172)
@@ -84,5 +84,5 @@
         if(i == null)
         {
-            System.out.println("Mappaint style \""+namespace+"\" icon \"" + ref.iconName + "\" not found.");
+            System.out.println("Mappaint style \""+namespace+"\" ("+ref.source.getDisplayString()+") icon \"" + ref.iconName + "\" not found.");
             return null;
         }
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 4171)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 4172)
@@ -88,5 +88,5 @@
 
     public enum PresetType {
-        NODE("Mf_node"), WAY("Mf_way"), RELATION("Mf_relation"), CLOSEDWAY("Mf_closedway");
+        NODE(/* ICON */"Mf_node"), WAY(/* ICON */"Mf_way"), RELATION(/* ICON */"Mf_relation"), CLOSEDWAY(/* ICON */"Mf_closedway");
 
         private final String iconName;
Index: trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java	(revision 4171)
+++ trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java	(revision 4172)
@@ -65,6 +65,6 @@
                 if(Main.applet) {
                     URLConnection conn = url.openConnection();
-                    conn.setConnectTimeout(5000);
-                    conn.setReadTimeout(5000);
+                    conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
+                    conn.setReadTimeout(Main.pref.getInteger("socket.timeout.read",30)*1000);
                     fs = new BufferedInputStream(conn.getInputStream());
                     file = new File(url.getFile());
@@ -218,6 +218,6 @@
         try {
             URLConnection conn = url.openConnection();
-            conn.setConnectTimeout(5000);
-            conn.setReadTimeout(5000);
+            conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
+            conn.setReadTimeout(Main.pref.getInteger("socket.timeout.read",30)*1000);
             bis = new BufferedInputStream(conn.getInputStream());
             FileOutputStream fos = new FileOutputStream(destDirFile);
Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 4171)
+++ trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 4172)
@@ -546,5 +546,5 @@
                 System.out.print(requestMethod + " " + url + "... ");
                 activeConnection = (HttpURLConnection)url.openConnection();
-                activeConnection.setConnectTimeout(fastFail ? 1000 : 15000);
+                activeConnection.setConnectTimeout(fastFail ? 1000 : Main.pref.getInteger("socket.timeout.connect",15)*1000);
                 activeConnection.setRequestMethod(requestMethod);
                 if (doAuthenticate) {
Index: trunk/src/org/openstreetmap/josm/io/OsmServerReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 4171)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 4172)
@@ -79,5 +79,5 @@
             }
 
-            activeConnection.setConnectTimeout(15000);
+            activeConnection.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
 
             try {
Index: trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java	(revision 4171)
+++ trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java	(revision 4172)
@@ -175,6 +175,6 @@
         }
         conn.setRequestProperty("User-Agent", Main.pref.get("imagery.wms.user_agent", Version.getInstance().getAgentString()));
-        conn.setConnectTimeout(Main.pref.getInteger("imagery.wms.timeout.connect", 30) * 1000);
-        conn.setReadTimeout(Main.pref.getInteger("imagery.wms.timeout.read", 30) * 1000);
+        conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15) * 1000);
+        conn.setReadTimeout(Main.pref.getInteger("socket.timeout.read", 30) * 1000);
 
         String contentType = conn.getHeaderField("Content-Type");