diff --git a/data/classificator.txt b/data/classificator.txt
index 54b0bffc9b..4b8fb1aa37 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -586,7 +586,9 @@ world  +
         swimming_pool  +
             private  -
             {}
-        track  -
+        track  +
+            area  -
+            {}
         water_park  -
         {}
     man_made  +
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 95ed193b42..d3cac2842f 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 8348a925e4..110c2b84b0 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -38580,20 +38580,11 @@ cont {
 }
 cont {
   name: "leisure-track"
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 6510384
-      priority: 1320
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
       width: 1.5
-      color: 6510384
+      color: 13749671
       priority: 1320
       cap: BUTTCAP
     }
@@ -38602,7 +38593,7 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 13749671
       priority: 1320
     }
     caption {
@@ -38618,7 +38609,7 @@ cont {
     scale: 17
     lines {
       width: 3.0
-      color: 6510384
+      color: 13749671
       priority: 1047
     }
     caption {
@@ -38635,7 +38626,7 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 13749671
       priority: 1047
     }
     caption {
@@ -38652,7 +38643,7 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 13749671
       priority: 1047
     }
     caption {
@@ -38666,6 +38657,76 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-track-area"
+  element {
+    scale: 15
+    area {
+      color: 13749671
+      priority: -15680
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13749671
+      priority: -15680
+    }
+    caption {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 15320
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13749671
+      priority: -15680
+    }
+    caption {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 15320
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13749671
+      priority: -15680
+    }
+    caption {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 15320
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13749671
+      priority: -15680
+    }
+    caption {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 15320
+    }
+  }
+}
 cont {
   name: "leisure-water_park"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 74713d2711..ebae892c07 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 78270bfc9e..9b62715a34 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -38221,20 +38221,11 @@ cont {
 }
 cont {
   name: "leisure-track"
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 6510384
-      priority: 1320
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
       width: 1.5
-      color: 6510384
+      color: 13749671
       priority: 1320
       cap: BUTTCAP
     }
@@ -38243,7 +38234,7 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 13749671
       priority: 1320
     }
     caption {
@@ -38259,7 +38250,7 @@ cont {
     scale: 17
     lines {
       width: 3.0
-      color: 6510384
+      color: 13749671
       priority: 1047
     }
     caption {
@@ -38276,7 +38267,7 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 13749671
       priority: 1047
     }
     caption {
@@ -38293,7 +38284,7 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 13749671
       priority: 1047
     }
     caption {
@@ -38307,6 +38298,76 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-track-area"
+  element {
+    scale: 15
+    area {
+      color: 13749671
+      priority: -15680
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13749671
+      priority: -15680
+    }
+    caption {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 15320
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13749671
+      priority: -15680
+    }
+    caption {
+      primary {
+        height: 9
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 15320
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13749671
+      priority: -15680
+    }
+    caption {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 15320
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13749671
+      priority: -15680
+    }
+    caption {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+      }
+      priority: 15320
+    }
+  }
+}
 cont {
   name: "leisure-water_park"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 4ba761f95a..28977e1cbe 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 9f390fb8a5..8dc5a07dee 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -38364,20 +38364,11 @@ cont {
 }
 cont {
   name: "leisure-track"
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 6247213
-      priority: 1320
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 15
     lines {
       width: 1.5
-      color: 6247213
+      color: 2171163
       priority: 1320
       cap: BUTTCAP
     }
@@ -38386,7 +38377,7 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6247213
+      color: 2171163
       priority: 1320
     }
     caption {
@@ -38402,7 +38393,7 @@ cont {
     scale: 17
     lines {
       width: 3.0
-      color: 6247213
+      color: 2171163
       priority: 1047
     }
     caption {
@@ -38419,7 +38410,7 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6247213
+      color: 2171163
       priority: 1047
     }
     caption {
@@ -38436,7 +38427,7 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6247213
+      color: 2171163
       priority: 1047
     }
     caption {
@@ -38450,6 +38441,76 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-track-area"
+  element {
+    scale: 15
+    area {
+      color: 2171163
+      priority: -15680
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2171163
+      priority: -15680
+    }
+    caption {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 15320
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2171163
+      priority: -15680
+    }
+    caption {
+      primary {
+        height: 9
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 15320
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2171163
+      priority: -15680
+    }
+    caption {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 15320
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2171163
+      priority: -15680
+    }
+    caption {
+      primary {
+        height: 10
+        color: 7829367
+        stroke_color: 856756480
+      }
+      priority: 15320
+    }
+  }
+}
 cont {
   name: "leisure-water_park"
   element {
diff --git a/data/types.txt b/data/types.txt
index 89344855ee..cc746ef5bc 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -405,7 +405,7 @@ mapswithme
 *aerialway|gondola
 tourism|museum
 *highway|living_street|bridge
-mapswithme
+*leisure|track|area
 *railway|monorail
 mapswithme
 mapswithme
diff --git a/data/visibility.txt b/data/visibility.txt
index d431407a3a..67724cec23 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -586,7 +586,9 @@ world  00000000000000000000  +
         swimming_pool  00000000000001111111  +
             private  00000000000001111111  -
             {}
-        track  00000000000000000000  -
+        track  00000000000000000000  +
+            area  00000000000000000000  -
+            {}
         water_park  00000000000000000000  -
         {}
     man_made  00000000000000000000  +