Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7420)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 7421)
@@ -3546,24 +3546,24 @@
 /* maxspeed nodes */
 /******************/
-node[maxspeed=none] {
+node[maxspeed=none][!is_prop_set(icon-image)] {
     icon-image: "vehicle/restriction/maxspeed_none.svg";
 }
-node|z17-[maxspeed=~/^[0-9]+$/] {
+node|z17-[maxspeed=~/^[0-9]+$/][!is_prop_set(icon-image)] {
     maxspeedprop: tag(maxspeed);
     set maxspeedclass;
 }
-node|z17-[maxspeed=signals] {
+node|z17-[maxspeed=signals][!is_prop_set(icon-image)] {
     maxspeedprop: " ?";
     set maxspeedclass;
 }
-node|z17-[maxspeed=~/^[0-9]+ mph/] {
+node|z17-[maxspeed=~/^[0-9]+ mph/][!is_prop_set(icon-image)] {
     maxspeedprop: get(split(" mph",tag(maxspeed)),0);
     set maxspeedclass;
 }
-node|z17-[maxspeed=~/[0-9]+ km\/h/] {
+node|z17-[maxspeed=~/[0-9]+ km\/h/][!is_prop_set(icon-image)] {
     maxspeedprop: get(split(" km/h",tag(maxspeed)),0);
     set maxspeedclass;
 }
-node|z17-[maxspeed=~/[0-9]+ knots/] {
+node|z17-[maxspeed=~/[0-9]+ knots/][!is_prop_set(icon-image)] {
     maxspeedprop: get(split(" knots",tag(maxspeed)),0);
     set maxspeedclass;
@@ -3576,10 +3576,10 @@
     major-z-index: 4.2;
 }
-node|z17-[maxspeed]["maxspeed:variable"]["maxspeed:variable"!="no"][!is_prop_set(icon-image, default)]::core_maxnodebg,
-node|z17-[maxspeed=signals][!is_prop_set(icon-image, default)]::core_maxnodebg {
+node|z17-[maxspeed]["maxspeed:variable"]["maxspeed:variable"!="no"]::core_maxnodebg,
+node|z17-[maxspeed=signals]::core_maxnodebg {
     /* background (black) */
     symbol-fill-color: black;
 }
-node|z17-[prop(maxspeedclass, default)][!is_prop_set(icon-image, default)]::core_maxnodefg {
+node|z17-[prop(maxspeedclass, default)]::core_maxnodefg {
     /* foreground (black text and red circle) */
     symbol-shape: circle;
@@ -3597,6 +3597,6 @@
     major-z-index: 4.2;
 }
-node|z17-[maxspeed]["maxspeed:variable"]["maxspeed:variable"!="no"][!is_prop_set(icon-image, default)]::core_maxnodefg,
-node|z17-[maxspeed=signals][!is_prop_set(icon-image, default)]::core_maxnodefg {
+node|z17-[maxspeed]["maxspeed:variable"]["maxspeed:variable"!="no"]::core_maxnodefg,
+node|z17-[maxspeed=signals]::core_maxnodefg {
     /* foreground (white text) */
     text-color: white;
@@ -3610,5 +3610,5 @@
     text: auto;
 }
-node|z16-[!is_prop_set("icon-image")]!.maxspeedclass {
+node|z16, node|z17-[!is_prop_set("icon-image")]!.maxspeedclass {
     symbol-size:1;
     symbol-shape: square;