diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml
index 3ae6e621e..96474e4cd 100644
--- a/android/app/src/main/res/values/types_strings.xml
+++ b/android/app/src/main/res/values/types_strings.xml
@@ -647,6 +647,7 @@
     <string name="type.leisure">Leisure</string>
     <string name="type.leisure.common">Public Land</string>
     <string name="type.leisure.dog_park">Dog Park</string>
+    <string name="type.leisure.escape_game">Escape Room</string>
     <string name="type.leisure.fitness_centre">Fitness Centre</string>
     <string name="type.leisure.fitness_station">Fitness Station</string>
     <string name="type.leisure.dance">Dance Hall</string>
diff --git a/data/categories.txt b/data/categories.txt
index ff1b6d516..da31eda62 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -8954,6 +8954,9 @@ tr:Minigolf
 uk:Мінігольф
 zh-Hans:迷你高尔夫
 
+leisure-escape_game
+en:4Escape Room|Escape Game
+
 leisure-hackerspace
 en:4Hackerspace
 ar:هاكرزبيس
diff --git a/data/editor.config b/data/editor.config
index 77d127d39..e5dd2a35b 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -1355,6 +1355,9 @@
       <type id="leisure-hackerspace">
         <include group="poi_internet" />
       </type>
+      <type id="leisure-escape_game">
+        <include group="poi_internet" />
+      </type>
       <!-- Uncomment this after our editor core supports complex types
       <type id="amenity-vending_machine-cigarettes">
         <tag k="amenity" v="vending_machine" />
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 7fb4438d2..bd90284a5 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -608,7 +608,7 @@ boundary|protected_area|6;[boundary=protected_area][protect_class=6];;name;int_n
 leisure|park|permissive;[leisure=park][access=permissive];;name;int_name;487;
 highway|bridleway|tunnel;[highway=bridleway][tunnel?];;name;int_name;488;
 highway|motorway_link|tunnel;[highway=motorway_link][tunnel?];;name;int_name;489;
-deprecated|deprecated;490;x
+leisure|escape_game;490;
 deprecated|deprecated;491;x
 deprecated|deprecated;492;x
 highway|tertiary_link|bridge;[highway=tertiary_link][bridge?];;name;int_name;493;
diff --git a/data/styles/default/dark/symbols/escape_game.svg b/data/styles/default/dark/symbols/escape_game.svg
new file mode 100644
index 000000000..8236751e4
--- /dev/null
+++ b/data/styles/default/dark/symbols/escape_game.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18"><circle cx="9" cy="9" r="9" opacity=".6"/><circle cx="9" cy="9" r="8.25" fill="#7f5933"/><path fill="#fff" fill-rule="evenodd" d="M5.194 4.525h1.35v5.4h-1.35z" style="fill:#000;fill-opacity:1;stroke-width:.9"/><path fill="#fff" fill-rule="evenodd" d="M5.194 5.2h2.7v1.35h-2.7z" style="fill:#000;fill-opacity:1;stroke-width:.9"/><circle cx="5.869" cy="11.613" r="1.688" fill="none" stroke="#000" stroke-width="1.35" style="stroke:#000;stroke-opacity:1"/><path fill="#fff" fill-rule="evenodd" d="M12.506 11.275h-1.575l-.006-.407q0-.754.25-1.24c.166-.324.458-.735.957-1.141q.748-.608.894-.796.225-.297.225-.657 0-.497-.402-.85-.396-.359-1.07-.359-.65 0-1.087.371c-.292.247-.446.624-.555 1.13l-1.568-.194q.067-1.088.923-1.847c.576-.507 1.283-.76 2.214-.76.981 0 1.715.257 2.293.772q.87.765.87 1.787 0 .564-.322 1.069a5.7 5.7 0 0 1-1.251 1.42q-.54.45-.675.724-.126.272-.115.978m-1.687 2.25v-1.8h1.8v1.8z" style="fill:#000;fill-opacity:1;stroke-width:.9"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 29ef78d5f..af7842aec 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -1270,6 +1270,8 @@ area|z17-[amenity=language_school]
 node|z17-[leisure=hackerspace],
 area|z17-[leisure=hackerspace]
 {icon-image: hackerspace-m.svg;}
+node|z17-[leisure=escape_game]
+{icon-image: escape_game.svg;}
 
 /* 5.3 Sport */
 
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index f25c8e19e..8ac6abad0 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -932,6 +932,7 @@ healthcare-laboratory                               # icon z17- (also has captio
 healthcare-optometrist                              # icon z17- (also has caption(optional) z17-)
 healthcare-physiotherapist                          # icon z17- (also has caption(optional) z17-)
 healthcare-sample_collection                        # icon z17- (also has caption(optional) z17-)
+leisure-escape_game                                 # icon z17- (also has caption(optional) z17-)
 leisure-fitness_centre                              # icon z17- (also has caption(optional) z17-)
 leisure-hackerspace                                 # icon z17- (also has caption(optional) z17-)
 leisure-sauna                                       # icon z17- (also has caption(optional) z17-)
@@ -1884,6 +1885,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # healthcare-optometrist                            # caption(optional) z17- (also has icon z17-)
 # healthcare-physiotherapist                        # caption(optional) z17- (also has icon z17-)
 # healthcare-sample_collection                      # caption(optional) z17- (also has icon z17-)
+# leisure-escape_game                               # caption(optional) z17- (also has icon z17-)
 # leisure-fitness_centre                            # caption(optional) z17- (also has icon z17-)
 # leisure-hackerspace                               # caption(optional) z17- (also has icon z17-)
 # leisure-sauna                                     # caption(optional) z17- (also has icon z17-)
diff --git a/data/styles/default/light/symbols/escape_game.svg b/data/styles/default/light/symbols/escape_game.svg
new file mode 100644
index 000000000..31a4bfa10
--- /dev/null
+++ b/data/styles/default/light/symbols/escape_game.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18"><circle cx="9" cy="9" r="9" fill="#fff" opacity=".6"/><circle cx="9" cy="9" r="8.25" fill="#7f5933"/><path fill="#fff" fill-rule="evenodd" d="M5.194 4.525h1.35v5.4h-1.35z" style="stroke-width:.9"/><path fill="#fff" fill-rule="evenodd" d="M5.194 5.2h2.7v1.35h-2.7z" style="stroke-width:.9"/><circle cx="5.869" cy="11.613" r="1.688" fill="none" stroke="#fff" stroke-width="1.5"/><path fill="#fff" fill-rule="evenodd" d="M12.506 11.275h-1.575l-.006-.407q0-.754.25-1.24c.166-.324.458-.735.957-1.141q.748-.608.894-.796.225-.297.225-.657 0-.497-.402-.85-.396-.359-1.07-.359-.65 0-1.087.371c-.292.247-.446.624-.555 1.13l-1.568-.194q.067-1.088.923-1.847c.576-.507 1.283-.76 2.214-.76.981 0 1.715.257 2.293.772q.87.765.87 1.787 0 .564-.322 1.069a5.7 5.7 0 0 1-1.251 1.42q-.54.45-.675.724-.126.272-.115.978m-1.687 2.25v-1.8h1.8v1.8z" style="stroke-width:.9"/></svg>
\ No newline at end of file
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 074733116..826dccf4e 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -932,6 +932,7 @@ healthcare-laboratory                               # icon z17- (also has captio
 healthcare-optometrist                              # icon z17- (also has caption(optional) z17-)
 healthcare-physiotherapist                          # icon z17- (also has caption(optional) z17-)
 healthcare-sample_collection                        # icon z17- (also has caption(optional) z17-)
+leisure-escape_game                                 # icon z17- (also has caption(optional) z17-)
 leisure-fitness_centre                              # icon z17- (also has caption(optional) z17-)
 leisure-hackerspace                                 # icon z17- (also has caption(optional) z17-)
 leisure-sauna                                       # icon z17- (also has caption(optional) z17-)
@@ -1887,6 +1888,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # healthcare-optometrist                            # caption(optional) z17- (also has icon z17-)
 # healthcare-physiotherapist                        # caption(optional) z17- (also has icon z17-)
 # healthcare-sample_collection                      # caption(optional) z17- (also has icon z17-)
+# leisure-escape_game                               # caption(optional) z17- (also has icon z17-)
 # leisure-fitness_centre                            # caption(optional) z17- (also has icon z17-)
 # leisure-hackerspace                               # caption(optional) z17- (also has icon z17-)
 # leisure-sauna                                     # caption(optional) z17- (also has icon z17-)
diff --git a/data/types.txt b/data/types.txt
index b513b6eab..4f3ba3bfc 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -487,7 +487,7 @@ mapswithme
 *leisure|park|permissive
 *highway|bridleway|tunnel
 *highway|motorway_link|tunnel
-mapswithme
+*leisure|escape_game
 mapswithme
 mapswithme
 *highway|tertiary_link|bridge
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
index a23510eef..7ce532875 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -726,6 +726,7 @@
 "type.leisure" = "Leisure";
 "type.leisure.common" = "Public Land";
 "type.leisure.dog_park" = "Dog Park";
+"type.leisure.escape_game" = "Escape Room";
 "type.leisure.fitness_centre" = "Fitness Centre";
 "type.leisure.fitness_station" = "Fitness Station";
 "type.leisure.dance" = "Dance Hall";