Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 767)
+++ trunk/styles/standard/elemstyles.xml	(revision 777)
@@ -718,5 +718,5 @@
         <condition k="waterway" v="dock"/>
         <line width="1" colour="#0000cf"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="nautical/boatyard.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1944,5 +1944,5 @@
 	<rule>
 		<condition k="shop" v="beverages" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/beverages.png" />
 		<area colour="#00005f"/>
         <scale_min>1</scale_min>
@@ -2040,5 +2040,5 @@
 	<rule>
 		<condition k="shop" v="florist" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/florist.png" />
 		<area colour="#00005f"/>
         <scale_min>1</scale_min>
@@ -3350,4 +3350,18 @@
 	<rule>
 		<condition k="openGeoDB:type" v="Ort" />
+		<icon annotate="true" src="places/settlement/town.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="openGeoDB:type" v="District" />
+		<icon annotate="true" src="places/settlement/town.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="openGeoDB:location" v="locality" />
 		<icon annotate="true" src="places/settlement/town.png" />
         <scale_min>1</scale_min>