diff --git a/assets/layers/car_rental/car_rental.json b/assets/layers/car_rental/car_rental.json
new file mode 100644
index 0000000000..18da669108
--- /dev/null
+++ b/assets/layers/car_rental/car_rental.json
@@ -0,0 +1,97 @@
+{
+  "id": "car_rental",
+  "name": {
+    "en": "Car Rental",
+    "nl": "Autoverhuur"
+  },
+  "source": {
+    "osmTags": "amenity=car_rental"
+  },
+  "minzoom": 12,
+  "title": {
+    "render": {
+      "en": "Car Rental",
+      "nl": "Autoverhuur"
+    },
+    "mappings": [
+      {
+        "if": "name~*",
+        "then": "{name}"
+      }
+    ]
+  },
+  "description": {
+    "en": "Places where you can rent a car",
+    "nl": "Plaatsen waar je een auto kunt huren"
+  },
+  "tagRenderings": [
+    "images",
+    {
+      "id": "name",
+      "freeform": {
+        "key": "name",
+        "type": "string",
+        "placeholder": {
+          "en": "Name of the car rental",
+          "nl": "Naam van de autoverhuur"
+        }
+      },
+      "question": {
+        "en": "What is the name of this car rental?",
+        "nl": "Wat is de naam van deze autoverhuur?"
+      },
+      "mappings": [
+        {
+          "if": "noname=yes",
+          "then": {
+            "en": "This car rental has no name",
+            "nl": "Deze autoverhuur heeft geen naam"
+          }
+        }
+      ],
+      "render": {
+        "en": "This car rental is called {name}",
+        "nl": "Deze autoverhuur heet {name}"
+      }
+    },
+    "website",
+    "email",
+    "phone",
+    "opening_hours"
+  ],
+  "presets": [
+    {
+      "tags": [
+        "amenity=car_rental"
+      ],
+      "title": {
+        "en": "a car rental",
+        "nl": "een autoverhuur"
+      },
+      "description": {
+        "en": "A place where you can rent a car",
+        "nl": "Een plaats waar je een auto kunt huren"
+      }
+    }
+  ],
+  "mapRendering": [
+    {
+      "icon": "circle:white;./assets/layers/car_rental/car_rental.svg",
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "label": "<div class='bg-white block p-1 rounded'>{name}</div>"
+    },
+    {
+      "color": "darkblue",
+      "width": 2
+    }
+  ],
+  "allowMove": {
+    "enableImproveAccuracy": true
+  },
+  "filter": [
+    "open_now"
+  ]
+}
\ No newline at end of file
diff --git a/assets/layers/car_rental/car_rental.svg b/assets/layers/car_rental/car_rental.svg
new file mode 100644
index 0000000000..19a148724e
--- /dev/null
+++ b/assets/layers/car_rental/car_rental.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m544.86 93.91h395l63.648 64.223c11.496 11.617 11.219 19.812 0 31.5l-77.555 77.531-45.445-45.434-45.445 45.434-44.832-44.82-43.621 43.633-45.434-45.457-59.387 59.375h-96.926l0.003906-185.98z"/>
+  <path d="m968.95 704.61-73.922-190.84c-13.801-36.527-44.016-67.609-101.18-67.871h-104.21l-178.12-0.003907h-106.02c-56.891 0.25391-87.098 31.332-101.17 67.871l-73.922 190.84c-29.34 3.7773-81.273 38.266-81.18 103.59v242.96h72.098v77.543c-0.16797 95.629 135.13 94.488 135.1 0v-77.543h486.5v77.543c0.30078 94.488 135.61 95.629 135.7 0v-77.543h72.145v-242.96c-0.24219-65.328-52.227-99.816-81.816-103.59zm-677.95 199.92c-34.559 0.10937-62.555-28.727-62.398-64.188-0.15625-35.699 27.84-64.547 62.398-64.262 34.465-0.27734 62.449 28.57 62.398 64.262 0.0625 35.461-27.934 64.297-62.398 64.188zm308.99-201.73h-292.63l55.738-150.27c6.7188-21.324 17.172-36.59 41.809-36.961h390.17c24.289 0.37109 34.754 15.637 41.785 36.961l55.766 150.27zm308.99 201.73c-34.812 0.10937-62.809-28.727-63.023-64.188 0.21484-35.699 28.211-64.547 63.023-64.262 34.199-0.27734 62.184 28.57 62.387 64.262-0.20312 35.461-28.188 64.297-62.387 64.188z"/>
+  <path d="m406.71 0c-102.31-0.21484-185.16 83.484-185.39 186.6 0.22656 103.34 83.074 187.04 185.39 187.21 102.1-0.16797 184.95-83.867 184.8-187.21 0.14453-103.12-82.703-186.82-184.8-186.6zm-81.18 235.68c-27.348-0.25391-49.332-22.5-49.078-49.691-0.25391-27.574 21.73-49.812 49.078-49.68 26.891-0.14453 48.875 22.105 49.078 49.68-0.1875 27.191-22.172 49.441-49.078 49.691z"/>
+ </g>
+</svg>
diff --git a/assets/layers/car_rental/license_info.json b/assets/layers/car_rental/license_info.json
new file mode 100644
index 0000000000..31c8cda5ec
--- /dev/null
+++ b/assets/layers/car_rental/license_info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "path": "car_rental.svg",
+    "license": "CC0",
+    "authors": [
+      "American Institute of Graphic Arts"
+    ],
+    "sources": [
+      "https://thenounproject.com/icon/car-rental-71/"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/themes/stations/stations.json b/assets/themes/stations/stations.json
index 515d7711fc..c51b09d25e 100644
--- a/assets/themes/stations/stations.json
+++ b/assets/themes/stations/stations.json
@@ -135,6 +135,19 @@
         ]
       }
     },
+    {
+      "builtin": "car_rental",
+      "override": {
+        "isShown": {
+          "or": [
+            "indoor=room",
+            "indoor=area"
+          ]
+        },
+        "presets": null,
+        "minzoom": 19
+      }
+    },
     {
       "builtin": [
         "food",
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 18ac0e2dc4..23d222a061 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -1337,6 +1337,33 @@
             "render": "Pub"
         }
     },
+    "car_rental": {
+        "description": "Places where you can rent a car",
+        "name": "Car Rental",
+        "presets": {
+            "0": {
+                "description": "A place where you can rent a car",
+                "title": "a car rental"
+            }
+        },
+        "tagRenderings": {
+            "name": {
+                "freeform": {
+                    "placeholder": "Name of the car rental"
+                },
+                "mappings": {
+                    "0": {
+                        "then": "This car rental has no name"
+                    }
+                },
+                "question": "What is the name of this car rental?",
+                "render": "This car rental is called {name}"
+            }
+        },
+        "title": {
+            "render": "Car Rental"
+        }
+    },
     "charging_station": {
         "description": "A charging station",
         "filter": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index e111be279a..cd1ce33a1e 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -1306,6 +1306,33 @@
             "render": "Café"
         }
     },
+    "car_rental": {
+        "description": "Plaatsen waar je een auto kunt huren",
+        "name": "Autoverhuur",
+        "presets": {
+            "0": {
+                "description": "Een plaats waar je een auto kunt huren",
+                "title": "een autoverhuur"
+            }
+        },
+        "tagRenderings": {
+            "name": {
+                "freeform": {
+                    "placeholder": "Naam van de autoverhuur"
+                },
+                "mappings": {
+                    "0": {
+                        "then": "Deze autoverhuur heeft geen naam"
+                    }
+                },
+                "question": "Wat is de naam van deze autoverhuur?",
+                "render": "Deze autoverhuur heet {name}"
+            }
+        },
+        "title": {
+            "render": "Autoverhuur"
+        }
+    },
     "charging_station": {
         "description": "Oplaadpunten",
         "filter": {
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 8926da3d9a..bda925a67c 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -1095,7 +1095,7 @@
                 "description": "Layer showing train stations",
                 "name": "Train Stations"
             },
-            "14": {
+            "15": {
                 "description": "Displays showing the trains that will leave from this station",
                 "name": "Departures boards",
                 "presets": {