diff --git a/data/categories.txt b/data/categories.txt
index 2997a890df..9a8c9cb6a5 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -5099,6 +5099,10 @@ sk:Dopravný uzol|3diaľnica
 sw:Njia panda
 fa:تقاطع
 
+highway-elevator
+en:Lift
+ru:Лифт
+
 # Skipped if empty name
 natural-peak
 en:Peak|mountain|mount|U+1F5FB|U+1F304
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index a3158185d9..9b2fce7302 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1054,7 +1054,7 @@ route|shuttle_train;1055;
 shop|copyshop;1056;
 shop|photo;1057;
 shop|travel_agency;[shop=travel_agency],[office=travel_agent];;name;int_name;1058;
-deprecated|deprecated;1059;x
+highway|elevator;1059;
 shop|outdoor;1060;
 deprecated|deprecated;1061;x
 deprecated|deprecated;1062;x
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index e5a17c1fea..3cc6e8158b 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -7481,6 +7481,10 @@
     ru = Велодорожка
     zh-Hans = 自行车道
 
+  [type.highway.elevator]
+    en = Elevator
+    ru = Лифт
+
   [type.highway.footway]
     en = Path
     ar = مسار
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 5658add96a..04975682e0 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -22,7 +22,7 @@
  5.5 Others
 6.SHOP
 7.CAR
-    7.1 Parking
+ 7.1 Parking
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
 
@@ -38,11 +38,12 @@ area|z16[amenity=parking_space]
 node|z17-[leisure=golf_course],
 area|z17-[leisure=golf_course]
 {z-index: 50;}
-/* нельзя другой z-inex^иначе пропадают все объекты на поле */
+/* нельзя другой z-index, иначе пропадают все объекты на поле */
 
 node[amenity=fountain],
 area[amenity=fountain]
 {z-index: 2000;}
+
 node[natural=spring],
 area[natural=spring],
 node[natural=hot_spring],
@@ -60,7 +61,9 @@ area[amenity=water_point],
 node[amenity=waste_basket],
 node[amenity=waste_disposal],
 area[amenity=waste_disposal],
-node[man_made=survey_point]
+node[man_made=survey_point],
+node[highway=elevator],
+area[highway=elevator],
 {z-index: 2100;}
 
 node[natural=cave_entrance],
@@ -937,6 +940,10 @@ node|z17-[railway=subway_entrance]
 node|z17-[railway=subway_entrance]::int_name
 {text-offset: 1;font-size: 11;text-halo-opacity: 0.9;text-optional: true;} /*check*/
 
+node|z17-[highway=elevator],
+area|z17-[highway=elevator],
+{icon-image: elevator.svg;}
+
 /* 3.3 Tram Station */
 
 node|z14[railway=tram_stop]
diff --git a/data/styles/clear/style-clear/symbols/elevator.svg b/data/styles/clear/style-clear/symbols/elevator.svg
new file mode 100644
index 0000000000..93e0668cad
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/elevator.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="elevator" width="15" height="15" viewBox="0 0 15 15">
+  <g id="Page-1:" fill="#717065" fill-rule="nonzero">
+    <path d="M11,1H4A1,1,0,0,0,3,2V13a1,1,0,0,0,1,1h7a1,1,0,0,0,1-1V2A1,1,0,0,0,11,1ZM7.5,12.5l-2-4h4Zm-2-6,2-4,2,4Z"/>
+  </g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/elevator.svg b/data/styles/clear/style-night/symbols/elevator.svg
new file mode 100644
index 0000000000..a5958d7fdc
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/elevator.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" id="elevator" width="15" height="15" viewBox="0 0 15 15">
+  <g id="Page-2:-Night" fill="#717065" fill-rule="nonzero" opacity="0.6">
+    <path d="M11,1H4A1,1,0,0,0,3,2V13a1,1,0,0,0,1,1h7a1,1,0,0,0,1-1V2A1,1,0,0,0,11,1ZM7.5,12.5l-2-4h4Zm-2-6,2-4,2,4Z"/>
+  </g>
+</svg>