diff --git a/buildings.mss b/buildings.mss
index 85280dd433..6b1b0bbcdd 100644
--- a/buildings.mss
+++ b/buildings.mss
@@ -1,9 +1,11 @@
-@building-fill: #d9d0c9; //Lch(84, 5, 70)
-@building-line: darken(@building-fill, 15%);
+@building-fill: #d9d0c9;  // Lch(84, 5, 68)
+@building-line: darken(@building-fill, 15%);  // Lch(70, 9, 66)
 @building-low-zoom: darken(@building-fill, 4%);
 
-@building-major-fill: darken(@building-fill, 20%);
-@building-major-line: darken(@building-major-fill, 25%);
+@building-major-fill: darken(@building-fill, 10%);  // Lch(75, 8, 67)
+@building-major-line: darken(@building-major-fill, 15%);  // Lch(61, 13, 65)
+@building-major-z15: darken(@building-major-fill, 5%);  // Lch(70, 9, 66)
+@building-major-z14: darken(@building-major-fill, 10%);  // Lch(66, 11, 65)
 
 @entrance-permissive: darken(@building-line, 15%);
 @entrance-normal: @building-line;
@@ -12,7 +14,6 @@
   [zoom >= 14] {
     polygon-fill: @building-low-zoom;
     polygon-clip: false;
-    line-width: 0;
     [zoom >= 15] {
       polygon-fill: @building-fill;
       line-color: @building-line;
@@ -24,8 +25,14 @@
     [aerialway = 'station'],
     [building = 'train_station'],
     [public_transport = 'station'] {
-      polygon-fill: @building-major-fill;
-      line-color: @building-major-line;
+      polygon-fill: @building-major-z14;
+      [zoom >= 15] {
+        polygon-fill: @building-major-z15;
+        line-color: @building-major-line;
+        [zoom >= 16] {
+          polygon-fill: @building-major-fill;
+        }
+      }
     }
   }
 }