diff --git a/data/categories.txt b/data/categories.txt
index b6ae700df3..7263ffad91 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -5718,6 +5718,44 @@ sk:3poštový úrad
fa:اداره پست
mr:टपालघर|पोस्ट ऑफिस
+amenity-vehicle_inspection
+en:Vehicle Inspection
+ar:فحص المركبة
+be:Тэхагляд аўтамабіля
+bg:Проверка на автомобила
+ca:Inspecció de vehicles
+cs:Kontrola vozidla
+da:Bilsyn
+de:Fahrzeuginspektion
+el:Έλεγχος οχήματος
+es:Inspección de vehículos
+et:Sõiduki ülevaatus
+eu:Ibilgailuen Ikuskapena
+fa:بازرسی وسایل نقلیه
+fi:Ajoneuvon tarkastus
+fr:Inspection de véhicule
+he:לבדיקה טכנית
+hu:Gépjármű átvizsgálás
+id:Pemeriksaan kendaraan
+it:Ispezione del veicolo
+ja:車検
+ko:차량검사
+mr:वाहन तपासणी
+nb:Inspeksjon av kjøretøy
+nl:Voertuiginspectie
+pl:Kontrola pojazdu
+pt:Inspeção veicular
+ro:Inspecția vehiculului
+ru:Техосмотр автомобиля
+sk:Kontrola vozidla
+sv:Fordonsinspektion
+sw:Ukaguzi wa Gari
+th:การตรวจสอบยานพาหนะ
+tr:Araç muayenesi
+uk:Техогляд автомобіля
+vi:Kiểm tra xe
+zh-Hans:车辆检验
+zh-Hant:車輛檢驗
amenity-waste_disposal
en:4Dumpster|4Trash bin|4garbage bin|waste disposal|U+1F6AE
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index b0bd5acc56..eea925e4e3 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1646,3 +1646,4 @@ leisure|adult_gaming_centre;1570;
leisure|amusement_arcade;1571;
amenity|place_of_worship|christian|mormon;[amenity=place_of_worship][religion=christian][denomination=mormon];;name;int_name;1572;
amenity|public_bath;1573;
+amenity|vehicle_inspection;1574;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 4bc63f80e3..f38881f07e 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -4827,6 +4827,45 @@
tr = Kilitlenebilen Kutu Dolaplar
uk = Поштомат
+ [type.amenity.vehicle_inspection]
+ en = Vehicle Inspection
+ ar = فحص المركبة
+ be = Тэхагляд аўтамабіля
+ bg = Проверка на автомобила
+ ca = Inspecció de vehicles
+ cs = Kontrola vozidla
+ da = Bilsyn
+ de = Fahrzeuginspektion
+ el = Έλεγχος οχήματος
+ es = Inspección de vehículos
+ et = Sõiduki ülevaatus
+ eu = Ibilgailuen Ikuskapena
+ fa = بازرسی وسایل نقلیه
+ fi = Ajoneuvon tarkastus
+ fr = Inspection de véhicule
+ he = לבדיקה טכנית
+ hu = Gépjármű átvizsgálás
+ id = Pemeriksaan kendaraan
+ it = Ispezione del veicolo
+ ja = 車検
+ ko = 차량검사
+ mr = वाहन तपासणी
+ nb = Inspeksjon av kjøretøy
+ nl = Voertuiginspectie
+ pl = Kontrola pojazdu
+ pt = Inspeção veicular
+ ro = Inspecția vehiculului
+ ru = Техосмотр автомобиля
+ sk = Kontrola vozidla
+ sv = Fordonsinspektion
+ sw = Ukaguzi wa Gari
+ th = การตรวจสอบยานพาหนะ
+ tr = Araç muayenesi
+ uk = Техогляд автомобіля
+ vi = Kiểm tra xe
+ zh-Hans = 车辆检验
+ zh-Hant = 車輛檢驗
+
[type.amenity.vending_machine.fuel]
en = Fuel Pump
af = Petrolpomp
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 8926b16b9f..6ca5b61ace 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -1813,6 +1813,8 @@ node|z16-[shop=car_parts],
area|z16-[shop=car_parts],
node|z16-[shop=car_repair],
area|z16-[shop=car_repair],
+node|z16-[amenity=vehicle_inspection],
+area|z16-[amenity=vehicle_inspection],
node|z16-[shop=tyres],
area|z16-[shop=tyres],
node|z16-[shop=chemist],
@@ -2012,6 +2014,9 @@ area|z16[shop=car_repair]
node|z16[shop=tyres],
area|z16[shop=tyres]
{icon-image: car-repair-m.svg;}
+node|z16-[amenity=vehicle_inspection],
+area|z16-[amenity=vehicle_inspection],
+{icon-image: vehicle_inspection-m.svg;}
node|z16[shop=chemist],
area|z16[shop=chemist]
{icon-image: chemist-m.svg;}
@@ -2227,6 +2232,9 @@ area|z17-[shop=car_repair]
node|z17-[shop=tyres],
area|z17-[shop=tyres]
{icon-image: car-repair-m.svg;icon-min-distance: 24;}
+node|z17-[amenity=vehicle_inspection],
+area|z17-[amenity=vehicle_inspection],
+{icon-image: vehicle_inspection-m.svg;icon-min-distance: 24;}
node|z17-[shop=chemist],
area|z17-[shop=chemist]
{icon-image: chemist-m.svg;icon-min-distance: 24;}
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index 75515b9aa8..f0505fddd1 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -775,6 +775,7 @@ tourism-aquarium # icon z16- (also has captio
tourism-picnic_site # icon z16- (also has caption(optional) z16-)
=== 2450
+amenity-vehicle_inspection # icon z16- (also has caption(optional) z16-)
shop-alcohol # icon z16- (also has caption(optional) z16-)
shop-art # icon z16- (also has caption(optional) z16-)
shop-auction # icon z16- (also has caption(optional) z16-)
@@ -1722,6 +1723,7 @@ amenity-parking-private # icon z18- (also has captio
# tourism-picnic_site # caption(optional) z16- (also has icon z16-)
# === -7550
+# amenity-vehicle_inspection # caption(optional) z16- (also has icon z16-)
# shop-alcohol # caption(optional) z16- (also has icon z16-)
# shop-art # caption(optional) z16- (also has icon z16-)
# shop-auction # caption(optional) z16- (also has icon z16-)
diff --git a/data/styles/clear/style-clear/symbols/vehicle_inspection-m.svg b/data/styles/clear/style-clear/symbols/vehicle_inspection-m.svg
new file mode 100644
index 0000000000..9f0f780607
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/vehicle_inspection-m.svg
@@ -0,0 +1,13 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/vehicle_inspection-m.svg b/data/styles/clear/style-night/symbols/vehicle_inspection-m.svg
new file mode 100644
index 0000000000..5c17c78efc
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/vehicle_inspection-m.svg
@@ -0,0 +1,13 @@
+
+
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 009579ca74..ce880fc793 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -746,6 +746,9 @@ area|z17[shop=car_parts]
node|z17[shop=car_repair],
area|z17[shop=car_repair]
{icon-image: car-repair-m.svg;icon-min-distance: 24;font-size: 13.75;}
+node|z17[amenity=vehicle_inspection],
+area|z17[amenity=vehicle_inspection],
+{icon-image: vehicle_inspection-m.svg;icon-min-distance: 24;font-size: 13.75;}
node|z18-[shop=car],
area|z18-[shop=car]
@@ -762,7 +765,9 @@ area|z18-[shop=car_parts]
node|z18-[shop=car_repair],
area|z18-[shop=car_repair]
{icon-image: car-repair-m.svg;font-size: 14.5;}
-
+node|z18-[amenity=vehicle_inspection],
+area|z18-[amenity=vehicle_inspection],
+{icon-image: vehicle_inspection-m.svg;font-size: 14.5;}
/* 7. CAR */
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index 0e121cca95..63ea940e33 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -172,6 +172,7 @@ railway-level_crossing # icon z17-
=== 2700
amenity-car_wash # icon z17- (also has caption(optional) z17-)
+amenity-vehicle_inspection # icon z17-
amenity-vending_machine-parking_tickets # icon z17- (also has caption(optional) z17-)
shop-car_parts # icon z17-
shop-car_repair # icon z17-