Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 7744)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 7763)
@@ -2051,10 +2051,6 @@
 area[amenity=parking_space],
 area[amenity=parking],
-area[parking=multi-storey],
 area[amenity=motorcycle_parking],
 area[amenity=bicycle_parking],
-area[parking=park_and_ride],
-area[parking=underground],
-area[parking=surface],
 area[amenity=bicycle_rental],
 area[amenity=car_rental],
@@ -2070,11 +2066,17 @@
     set icon_z17;
     text: auto;
-}node[amenity=parking] {
+}
+node[amenity=parking] {
     icon-image: vehicle/parking.png;
     set icon_z17;
     text: auto;
 }
-node[parking=multi-storey] {
+node[amenity=parking][parking=multi-storey] {
     icon-image: "vehicle/parking/multi-storey.png";
+    set icon_z17;
+    text: auto;
+}
+node[amenity=parking][parking=underground] {
+    icon-image: "vehicle/parking/underground.png";
     set icon_z17;
     text: auto;
@@ -2092,14 +2094,4 @@
 node[park_ride][park_ride!=no] {
     icon-image: "vehicle/parking/park_ride.svg";
-    set icon_z17;
-    text: auto;
-}
-node[parking=underground] {
-    icon-image: "vehicle/parking/underground.png";
-    set icon_z17;
-    text: auto;
-}
-node[parking=surface] {
-    icon-image: "vehicle/parking.png";
     set icon_z17;
     text: auto;