diff --git a/data/categories.txt b/data/categories.txt
index fc9a2bff48..ffff29efa2 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -3208,6 +3208,28 @@ sk:2Požičovňa bicyklov|bicykle|požičovňa
sw:Kodi ya baiskeli|baiskeli|kodi
fa:مکان اجاره دوچرخه
+amenity-bicycle_repair_station
+en:4Bicycle Repair Station|cycle|bike|4repair of bicycles
+ar:تصليح الدراجات
+cs:Oprava jízdních kol|4jízdní kolo|3kolo|Oprava
+da:4Cykel reparation
+de:4Fahrradreparatur|Radservicestation|Radreparatur
+es:Reparación de bicicletas|4bicicleta
+fa:تعمیر دوچرخه
+fi:Polkupyörän korjaus
+fr:Réparation de vélos|vélo|bicyclette|réparation
+hu:4Kerékpár javítás|kerékpár
+it:Riparazione di biciclette|4bicicletta|bici
+ja:自転車修理
+ko:자전거 수리
+nl:4Fiets reparatie
+pt:Conserto de bicicleta|4bicicleta
+ru:4Велоремонт|велосипед|ремонт|ремонт велосипедов
+tr:4Bisiklet tamiri|4Bisiklet
+uk:4Велоремонт|велосипед|ремонт|ремонт велосипедів
+zh-Hans:1自行车修理
+zh-Hant:1自行車修理
+
amenity-car_sharing
en:Car Share|3carsharing|car|sharing|U+1F697|U+1F698|U+1F699|carpool|carsharing services|car sharing|4rideshare
ru:3Каршеринг|аренда машин|аренда
diff --git a/data/editor.config b/data/editor.config
index 23f3775e57..5a45105268 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -180,6 +180,9 @@
+
+
+
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 9907852950..d892a6ebe5 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -269,7 +269,7 @@ natural|cave_entrance;[natural=cave_entrance],[natural=cave];;name;int_name;268;
highway|tertiary|tunnel;[highway=tertiary][tunnel?];;name;int_name;269;
landuse|landfill;270;
amenity|bicycle_rental;271;
-deprecated|deprecated;272;x
+amenity|bicycle_repair_station;272;
highway|tertiary_link;273;
landuse|greenfield;274;
tourism|alpine_hut;275;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index a0c7556586..286ea176f5 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -619,6 +619,34 @@
zh-Hans = 自行车出租点
zh-Hant = 自行車出租
+ [type.amenity.bicycle_repair_station]
+ en = Bicycle Repair Station
+ ar = محطة تصليح الدراجات
+ cs = Stanice na opravu jízdních kol
+ da = Cykelreparationsstation
+ de = Fahrrad-Reparaturstation
+ es = Estación de reparación de bicicletas
+ fa = ایستگاه تعمیر دوچرخه
+ fi = Polkupyörän korjausasema
+ fr = Station de réparation de vélos
+ hu = Kerékpárjavító állomás
+ it = Stazione di riparazione biciclette
+ ja = 自転車修理ステーション
+ ko = 자전거 수리소
+ nb = Sykkelreparasjonsstasjon
+ nl = Fiets reparatie station
+ pl = Stacja naprawy rowerów
+ pt = Estação de conserto de bicicletas
+ pt-BR = Estação de conserto de bicicletas
+ ru = Станция ремонта велосипедов
+ sw = Cykelreparationsstation
+ th = สถานีซ่อมจักรยาน
+ tr = Bisiklet tamir istasyonu
+ uk = Станція ремонту велосипедів
+ vi = trạm sửa xe đạp
+ zh-Hans = 自行车维修站
+ zh-Hant = 自行車維修站
+
[type.amenity.biergarten]
en = Biergarten
ar = متجر بيرة
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 1085ce173d..e9650b1b90 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -222,6 +222,8 @@ node[highway=rest_area],
area[highway=rest_area],
node[amenity=bicycle_rental],
area[amenity=bicycle_rental],
+node[amenity=bicycle_repair_station],
+area[amenity=bicycle_repair_station],
node[amenity=car_wash],
area[amenity=car_wash],
node[amenity=car_rental],
@@ -1423,6 +1425,8 @@ node|z17-[amenity=shower],
area|z17-[amenity=shower],
node|z17-[amenity=bicycle_rental],
area|z17-[amenity=bicycle_rental],
+node|z17-[amenity=bicycle_repair_station],
+area|z17-[amenity=bicycle_repair_station],
node|z17-[amenity=post_office],
area|z17-[amenity=post_office],
node|z17-[power=station],
@@ -1942,6 +1946,13 @@ node|z18-[amenity=bicycle_rental],
area|z18-[amenity=bicycle_rental]
{font-size: 11;text-optional: true;}
+node|z17-[amenity=bicycle_repair_station],
+area|z17-[amenity=bicycle_repair_station]
+{icon-image: bicycle-repair-station.svg;text-optional: true;}
+node|z18-[amenity=bicycle_repair_station],
+area|z18-[amenity=bicycle_repair_station]
+{font-size: 11;text-optional: true;}
+
node|z17-[amenity=post_office],
area|z17-[amenity=post_office],
{icon-image: mail-m.svg;text-optional: true;}
diff --git a/data/styles/clear/style-clear/symbols/bicycle-repair-station.svg b/data/styles/clear/style-clear/symbols/bicycle-repair-station.svg
new file mode 100644
index 0000000000..0a68d2415f
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/bicycle-repair-station.svg
@@ -0,0 +1,52 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/bicycle-repair-station.svg b/data/styles/clear/style-night/symbols/bicycle-repair-station.svg
new file mode 100644
index 0000000000..2ff70ccfd5
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/bicycle-repair-station.svg
@@ -0,0 +1,52 @@
+
+