diff --git a/data/classificator.txt b/data/classificator.txt
index 8f49cf3a6c..044e46550c 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -82,6 +82,11 @@ world  +
                 fee  -
                 {}
             {}
+        parking_space  +
+            permissive  -
+            private  -
+            underground  -
+            {}
         payment_terminal  -
         pharmacy  -
         place_of_worship  +
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 1ce02ff57c..81f93421fe 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 5df5465e2d..e626d3a655 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -5905,6 +5905,238 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking_space"
+  element {
+    scale: 15
+    symbol {
+      name: "parking-s"
+      priority: 16037
+      min_distance: 25
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "parking-s"
+      priority: 16037
+      min_distance: 25
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "amenity-parking_space-permissive"
+  element {
+    scale: 15
+    symbol {
+      name: "zero-icon"
+      priority: 16037
+      min_distance: 25
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16037
+      min_distance: 25
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "amenity-parking_space-private"
+  element {
+    scale: 15
+    symbol {
+      name: "zero-icon"
+      priority: 16037
+      min_distance: 25
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16037
+      min_distance: 25
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "amenity-parking_space-underground"
+  element {
+    scale: 15
+    symbol {
+      name: "zero-icon"
+      priority: 16037
+      min_distance: 25
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16037
+      min_distance: 25
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "zero-icon"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "zero-icon"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "amenity-payment_terminal"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index d8df82d768..9942c5399a 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 6fb8fcf211..390e5b301e 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -5871,6 +5871,206 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking_space"
+  element {
+    scale: 16
+    symbol {
+      name: "parking-s"
+      priority: 16037
+      min_distance: 25
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "amenity-parking_space-permissive"
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16037
+      min_distance: 25
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "amenity-parking_space-private"
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16037
+      min_distance: 25
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "amenity-parking_space-underground"
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16037
+      min_distance: 25
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "zero-icon"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "zero-icon"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "amenity-payment_terminal"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 8e07dd464e..02f6fcb159 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 7aa3c587ef..75b07d54c2 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -5871,6 +5871,206 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking_space"
+  element {
+    scale: 16
+    symbol {
+      name: "parking-s"
+      priority: 16037
+      min_distance: 25
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "amenity-parking_space-permissive"
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16037
+      min_distance: 25
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "amenity-parking_space-private"
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16037
+      min_distance: 25
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "amenity-parking_space-underground"
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16037
+      min_distance: 25
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "zero-icon"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "zero-icon"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "amenity-payment_terminal"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 3999a89f17..df09c2a969 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index f616d11737..b706d86141 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -2484,6 +2484,386 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking_space"
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -15035
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16965
+      min_distance: 3
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921870
+      priority: -15035
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16965
+      min_distance: 3
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15965
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16579778
+      priority: -15094
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16906
+      min_distance: 15
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16579778
+      priority: -15094
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16906
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16579778
+      priority: -15094
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16906
+      min_distance: 6
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+}
+cont {
+  name: "amenity-parking_space-permissive"
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -15035
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16965
+      min_distance: 3
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921870
+      priority: -15035
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16965
+      min_distance: 3
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15965
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16579778
+      priority: -15942
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16058
+      min_distance: 7
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15058
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16579778
+      priority: -15094
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16906
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16579778
+      priority: -15094
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16906
+      min_distance: 6
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+}
+cont {
+  name: "amenity-parking_space-private"
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -15035
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16965
+      min_distance: 3
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921870
+      priority: -15035
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16965
+      min_distance: 3
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15965
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16579778
+      priority: -15942
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16058
+      min_distance: 7
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15058
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16579778
+      priority: -15094
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16906
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16579778
+      priority: -15094
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16906
+      min_distance: 6
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+}
+cont {
+  name: "amenity-parking_space-underground"
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -15035
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16965
+      min_distance: 3
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921870
+      priority: -15035
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16965
+      min_distance: 3
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15965
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16579778
+      priority: -15094
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16906
+      min_distance: 15
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16579778
+      priority: -15094
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16906
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16579778
+      priority: -15094
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16906
+      min_distance: 6
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+}
 cont {
   name: "amenity-place_of_worship"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 4d5f425400..7410cc01d6 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 9a98580354..21374f4218 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -2484,6 +2484,386 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking_space"
+  element {
+    scale: 15
+    area {
+      color: 1643785
+      priority: -15035
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16965
+      min_distance: 3
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643785
+      priority: -15035
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16965
+      min_distance: 3
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15965
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2038026
+      priority: -15094
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16906
+      min_distance: 15
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2038026
+      priority: -15094
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16906
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2038026
+      priority: -15094
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16906
+      min_distance: 6
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+}
+cont {
+  name: "amenity-parking_space-permissive"
+  element {
+    scale: 15
+    area {
+      color: 1643785
+      priority: -15035
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16965
+      min_distance: 3
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643785
+      priority: -15035
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16965
+      min_distance: 3
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15965
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2038026
+      priority: -15942
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16058
+      min_distance: 7
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15058
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2038026
+      priority: -15094
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16906
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2038026
+      priority: -15094
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16906
+      min_distance: 6
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+}
+cont {
+  name: "amenity-parking_space-private"
+  element {
+    scale: 15
+    area {
+      color: 1643785
+      priority: -15035
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16965
+      min_distance: 3
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643785
+      priority: -15035
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16965
+      min_distance: 3
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15965
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2038026
+      priority: -15942
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16058
+      min_distance: 7
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15058
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2038026
+      priority: -15094
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16906
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2038026
+      priority: -15094
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16906
+      min_distance: 6
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+}
+cont {
+  name: "amenity-parking_space-underground"
+  element {
+    scale: 15
+    area {
+      color: 1643785
+      priority: -15035
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16965
+      min_distance: 3
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643785
+      priority: -15035
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16965
+      min_distance: 3
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15965
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2038026
+      priority: -15094
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16906
+      min_distance: 15
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2038026
+      priority: -15094
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16906
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2038026
+      priority: -15094
+    }
+    symbol {
+      name: "zero-icon"
+      priority: 16906
+      min_distance: 6
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15906
+    }
+  }
+}
 cont {
   name: "amenity-place_of_worship"
   element {
diff --git a/data/types.txt b/data/types.txt
index 3c28392aa9..067d6ad164 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1323,3 +1323,7 @@ cuisine|tea
 natural|geyser
 sponsored|promo_catalog
 natural|hot_spring
+amenity|parking_space
+amenity|parking_space|underground
+amenity|parking_space|private
+amenity|parking_space|permissive
diff --git a/data/visibility.txt b/data/visibility.txt
index 2ff3039774..b4dcc969cb 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -82,6 +82,11 @@ world  00000000000000000000  +
                 fee  00000000000000011111  -
                 {}
             {}
+        parking_space  00000000000000011111  +
+            permissive  00000000000000011111  -
+            private  00000000000000011111  -
+            underground  00000000000000011111  -
+            {}
         payment_terminal  00000000000000000000  -
         pharmacy  00000000000000000000  -
         place_of_worship  00000000000000001111  +