Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 7234)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 7235)
@@ -3090,10 +3090,12 @@
     text: auto;
 }
-node[natural=tree][type=conifer] {
+node[natural=tree][type=conifer],
+node[natural=tree][leaf_type=needleleaved] {
     icon-image: "misc/landmark/trees_conifer.png";
     text: auto;
 /*    priority="10"*/
 }
-node[natural=tree][type=broad_leaved] {
+node[natural=tree][type=broad_leaved],
+node[natural=tree][leaf_type=broadleaved] {
     icon-image: "misc/landmark/trees_broad_leaved.png";
     text: auto;
Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 7234)
+++ trunk/styles/standard/elemstyles.xml	(revision 7235)
@@ -346,5 +346,5 @@
 		<condition k="barrier" v="swing_gate"/>
 		<icon annotate="true" src="vehicle/swing_gate.png"/>
-    </rule>
+	</rule>
 	<rule>
 		<condition k="barrier" v="wall"/>
@@ -3199,5 +3199,17 @@
 	<rule>
 		<condition k="natural" v="tree"/>
+		<condition k="leaf_type" v="needleleaved"/>
+		<icon src="misc/landmark/trees_conifer.png" priority="10"/>
+	</rule>
+
+	<rule>
+		<condition k="natural" v="tree"/>
 		<condition k="type" v="broad_leaved"/>
+		<icon src="misc/landmark/trees_broad_leaved.png" priority="10"/>
+	</rule>
+
+	<rule>
+		<condition k="natural" v="tree"/>
+		<condition k="leaf_type" v="broadleaved"/>
 		<icon src="misc/landmark/trees_broad_leaved.png" priority="10"/>
 	</rule>