Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 915)
+++ /trunk/presets/presets.xml	(revision 916)
@@ -230,5 +230,5 @@
 		<separator/>
 
-		<item name="Road (Unknown Type)" icon="presets/way_unknown.png">
+		<item name="Road (Unknown Type)" icon="presets/way_unclassified.png">
 			<label text="Edit a Road of unknown type" />
 			<label text=" " />
@@ -293,4 +293,5 @@
 			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 		</item>
+
 		<item name="Bridge" icon="presets/bridge.png">
 			<label text="Edit a Bridge" />
@@ -308,6 +309,6 @@
 	</group> <!-- Streets -->
 
-	<group name="Ways" icon="presets/way_unknown.png">
-		<item name="Service" icon="presets/way_service.png">
+	<group name="Ways" icon="presets/way_unclassified.png">
+		<item name="Service" icon="presets/way_unclassified.png">
 			<label text="Edit a Serviceway" />
 			<label text=" " />
@@ -328,5 +329,5 @@
 		</item>
 
-		<item name="Parking Aisle" icon="presets/way_service.png">
+		<item name="Parking Aisle" icon="presets/way_unclassified.png">
 			<label text="Edit a Parking Aisle" />
 			<label text=" " />
@@ -459,5 +460,5 @@
 		<separator/>
 
-		<item name="Track" icon="presets/track.png">
+		<item name="Track" icon="presets/track1.png">
 			<label text="Edit a Track" />
 			<label text=" " />
@@ -778,4 +779,17 @@
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>
+
+		<item name="City Limit" icon="presets/citylimit.png">
+			<label text="Edit a city limit sign" />
+			<label text=" " />
+			<key key="traffic_sign" value="city_limit" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<text key="alt_name" text="Second Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Speed Camera" icon="presets/waypoints.png">
+			<key key="amenity" value="speed_camera" />
+		</item>
 	</group> <!-- Waypoints -->
 
@@ -1031,5 +1045,5 @@
 		</item>
 		
-		<item name="Railway Halt" icon="presets/railway_halt.png">
+		<item name="Railway Halt" icon="presets/station.png">
 			<label text="Edit Halt" />
 			<label text=" " />
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 915)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 916)
@@ -361,5 +361,8 @@
 		ImageIcon icon = ImageProvider.getIfAvailable(null, iconName);
 		if (icon == null)
+		{
+			System.out.println("Could not get presets icon " + iconName);
 			icon = new ImageIcon(iconName);
+		}
 		if (Math.max(icon.getIconHeight(), icon.getIconWidth()) != 16)
 			icon = new ImageIcon(icon.getImage().getScaledInstance(16, 16, Image.SCALE_SMOOTH));
Index: /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 915)
+++ /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 916)
@@ -1,4 +1,6 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.IOException;
@@ -33,5 +35,5 @@
 		String version = Main.pref.get("osm-server.version", "0.5");
 		urlStr = Main.pref.get("osm-server.url")+"/"+version+"/" + urlStr;
-		System.out.println("download: "+urlStr);
+//		System.out.println("download: "+urlStr);
 		initAuthentication();
 		URL url = new URL(urlStr);
@@ -45,8 +47,12 @@
 			activeConnection.setRequestProperty("Accept-Encoding", "gzip, deflate");
 
-		System.out.println("got return: "+activeConnection.getResponseCode());
 		activeConnection.setConnectTimeout(15000);
 		if (isAuthCancelled() && activeConnection.getResponseCode() == 401)
 			return null;
+		if( activeConnection.getResponseCode() == 500 )
+		{
+			throw new IOException(tr("Server returned internal error. Try a reduced area or retry after waiting some time."));
+		}
+//		System.out.println("got return: "+activeConnection.getResponseCode());
 
 		String encoding = activeConnection.getContentEncoding();
Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 915)
+++ /trunk/styles/standard/elemstyles.xml	(revision 916)
@@ -3529,3 +3529,10 @@
 	</rule>
 
+	<rule>
+		<condition k="traffic_sign" v="city_limit"/>
+		<icon annotate="true" src="citylimit.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>40000</scale_max>
+	</rule>
+
 </rules>