Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 5189)
+++ /trunk/styles/standard/elemstyles.xml	(revision 5190)
@@ -3634,5 +3634,5 @@
 <!--annotation tags -->
 
-<!--"work in progress" tags -->
+<!-- building/entrance/address -->
 
 	<rule>
@@ -3642,12 +3642,37 @@
 	</rule>
 
-	<rule>
-		<condition k="entrance"/>
-		<icon annotate="true" src="vehicle/entrance.png"/>
-	</rule>
-
-	<rule>
-		<condition k="area" b="yes"/>
-		<area colour="area#ffffff" priority="-10000"/>
+    <rule>
+        <condition k="building" v="entrance" />
+        <icon annotate="true" src="misc/entrance-yes.png" priority="100"/>
+    </rule>
+
+    <rule>
+        <condition k="entrance" v="yes" />
+        <icon annotate="true" src="misc/entrance-yes.png"/>
+    </rule>
+
+    <rule>
+        <condition k="entrance" v="main" />
+        <icon annotate="true" src="misc/entrance-main.png"/>
+    </rule>
+
+    <rule>
+        <condition k="entrance" v="service" />
+        <icon annotate="true" src="misc/entrance-service.png"/>
+    </rule>
+
+    <rule>
+        <condition k="entrance" v="exit" />
+        <icon annotate="true" src="misc/entrance-exit.png"/>
+    </rule>
+
+    <rule>
+        <condition k="entrance" v="emergency" />
+        <icon annotate="true" src="misc/entrance-emergency.png"/>
+    </rule>
+
+    <rule>
+        <condition k="area" b="yes"/>
+        <area colour="area#ffffff" priority="-10000"/>
 	</rule>
 
@@ -3680,9 +3705,11 @@
 		<condition k="addr:interpolation" v="alphabetic"/>
 		<line width="1" realwidth="1" dashed="1,1" colour="address#1C86EE"/>
-	</rule>
-
-	<rule> 
-		<condition k="fixme"/> 
-		<icon annotate="true" src="misc/fixme.png" priority="10000"/>
+    </rule>
+
+<!--"work in progress" tags -->
+
+    <rule> 
+        <condition k="fixme"/>
+        <icon annotate="true" src="misc/fixme.png" priority="10000"/>
 	</rule>