diff --git a/amenity-points.mss b/amenity-points.mss
diff --git a/citywalls.mss b/citywalls.mss
@@ -11,14 +11,3 @@
     }
   }
 }
-
-.castlewalls {
-  [zoom >= 14] {
-    line-color: #999;
-    line-width: 1;
-  }
-  [zoom >= 16] {
-    line-color: #888;
-    line-width: 2;
-  }
-}
diff --git a/landcover.mss b/landcover.mss
@@ -56,10 +56,9 @@
 @school: #f0f0d8; // also university, college, hospital, kindergarten
 @station: #d4aaaa;
 @orchard: #9ed88f;
-@theme_park: #734a08;
+@tourism: #734a08;
 @quarry: #c5c3c3;
 @military: #f55;
-@zoo: #a4f3a1;
 @beach: #fff1ba;
 
 #landcover-low-zoom[zoom < 10],
@@ -223,13 +222,6 @@
     }
   }
 
-  [feature = 'tourism_zoo'][zoom >= 10] {
-    polygon-fill: @zoo;
-    polygon-pattern-file: url('symbols/zoo.png');
-    [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
-  }
-
   [feature = 'leisure_common'][zoom >= 10] {
     polygon-fill: @grass;
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
@@ -631,17 +623,18 @@
   }
 }
 
-#theme-park {
-  [tourism = 'theme_park'][zoom >= 13] {
+#tourism-boundary {
+  [tourism = 'zoo'][zoom >= 10],
+  [tourism = 'theme_park'][zoom >= 10] {
     a/line-width: 1;
     a/line-offset: -0.5;
-    a/line-color: @theme_park;
+    a/line-color: @tourism;
     a/line-opacity: 0.5;
     a/line-join: round;
     a/line-cap: round;
     b/line-width: 4;
     b/line-offset: -2;
-    b/line-color: @theme_park;
+    b/line-color: @tourism;
     b/line-opacity: 0.3;
     b/line-join: round;
     b/line-cap: round;

diff --git a/project.mml b/project.mml
diff --git a/project.yaml b/project.yaml
diff --git a/roads.mss b/roads.mss
@@ -1471,7 +1471,7 @@ residential is rendered from z10 and is not included in osm_planet_roads. */
       }
     }
 
-    [feature = 'railway_rail'][zoom >= 6],
+    [feature = 'railway_rail'][zoom >= 7],
     [feature = 'railway_INT-spur-siding-yard'][zoom >= 11] {
       [zoom < 13] {
         line-color: #aaa;

diff --git a/symbols/beauty-14.svg b/symbols/beauty-14.svg
diff --git a/symbols/beverages-14.svg b/symbols/beverages-14.svg
diff --git a/symbols/cable_car.png b/symbols/cable_car.png
diff --git a/symbols/car_parts-14.svg b/symbols/car_parts-14.svg
diff --git a/symbols/chair_lift.png b/symbols/chair_lift.png
diff --git a/symbols/chemist-14.svg b/symbols/chemist-14.svg
diff --git a/symbols/confectionery-14.svg b/symbols/confectionery-14.svg
diff --git a/symbols/garden_centre-14.svg b/symbols/garden_centre-14.svg
diff --git a/symbols/greengrocer-14.svg b/symbols/greengrocer-14.svg
diff --git a/symbols/hifi-14.svg b/symbols/hifi-14.svg
diff --git a/symbols/hostel.16.svg b/symbols/hostel.16.svg
diff --git a/symbols/hostel.p.20.png b/symbols/hostel.p.20.png
diff --git a/symbols/hotel.16.svg b/symbols/hotel.16.svg
diff --git a/symbols/hotel2.p.20.png b/symbols/hotel2.p.20.png
diff --git a/symbols/laundry-14.svg b/symbols/laundry-14.svg
diff --git a/symbols/newsagent-14.svg b/symbols/newsagent-14.svg
diff --git a/symbols/perfumery-14.svg b/symbols/perfumery-14.svg
diff --git a/symbols/photo-14.svg b/symbols/photo-14.svg
diff --git a/symbols/stationery-14.svg b/symbols/stationery-14.svg
diff --git a/symbols/taxi.16.svg b/symbols/taxi.16.svg
diff --git a/symbols/tower_water.p.20.png b/symbols/tower_water.p.20.png
diff --git a/symbols/toys-14.svg b/symbols/toys-14.svg
diff --git a/symbols/travel_agency-14.svg b/symbols/travel_agency-14.svg
diff --git a/symbols/view_point.p.16.png b/symbols/view_point.p.16.png
diff --git a/symbols/viewpoint.16.svg b/symbols/viewpoint.16.svg
diff --git a/symbols/water_park.16.svg b/symbols/water_park.16.svg
diff --git a/symbols/water_park.p.20.png b/symbols/water_park.p.20.png
diff --git a/symbols/water_tower.16.svg b/symbols/water_tower.16.svg
diff --git a/symbols/windmill.16.svg b/symbols/windmill.16.svg
diff --git a/symbols/windmill.png b/symbols/windmill.png
diff --git a/symbols/zoo.png b/symbols/zoo.png