diff --git a/data/classificator.txt b/data/classificator.txt
index fc5e46b868..c179d6a0b7 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -676,6 +676,7 @@ world  +
         pitch  -
         playground  -
         recreation_ground  -
+        resort  -
         sauna  -
         slipway  -
         sports_centre  -
@@ -1395,7 +1396,6 @@ world  +
         motel  -
         museum  -
         picnic_site  -
-        resort  -
         theme_park  -
         viewpoint  -
         wilderness_hut  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 7d5cfe7abf..0a2f153feb 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 2caad8393a..18854c524b 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -54815,6 +54815,94 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-resort"
+  element {
+    scale: 16
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+}
 cont {
   name: "leisure-sauna"
   element {
@@ -128636,94 +128724,6 @@ cont {
     }
   }
 }
-cont {
-  name: "tourism-resort"
-  element {
-    scale: 16
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-}
 cont {
   name: "tourism-theme_park"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 2d12d1165e..d5e00cb8a9 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 79fd896c68..73f57b5332 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -52353,6 +52353,94 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-resort"
+  element {
+    scale: 16
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+}
 cont {
   name: "leisure-sauna"
   element {
@@ -124036,94 +124124,6 @@ cont {
     }
   }
 }
-cont {
-  name: "tourism-resort"
-  element {
-    scale: 16
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-}
 cont {
   name: "tourism-theme_park"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 4f2e316343..b48090a0cc 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 1ca97e0793..58b122f994 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -52617,6 +52617,94 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-resort"
+  element {
+    scale: 16
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+}
 cont {
   name: "leisure-sauna"
   element {
@@ -124251,94 +124339,6 @@ cont {
     }
   }
 }
-cont {
-  name: "tourism-resort"
-  element {
-    scale: 16
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-}
 cont {
   name: "tourism-theme_park"
   element {
diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin
index f8a3516ef6..fa31b6d747 100644
Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ
diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt
index 345ba6b390..ce3edb6af5 100644
--- a/data/drules_proto_outdoors_clear.txt
+++ b/data/drules_proto_outdoors_clear.txt
@@ -55395,6 +55395,94 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-resort"
+  element {
+    scale: 16
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+}
 cont {
   name: "leisure-sauna"
   element {
@@ -129682,94 +129770,6 @@ cont {
     }
   }
 }
-cont {
-  name: "tourism-resort"
-  element {
-    scale: 16
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-}
 cont {
   name: "tourism-theme_park"
   element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 669056a479..7687bd4238 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 30596cc50e..c7d337fcfe 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -55659,6 +55659,94 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-resort"
+  element {
+    scale: 16
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "hotel-m"
+      priority: 2750
+      min_distance: 16
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7250
+    }
+  }
+}
 cont {
   name: "leisure-sauna"
   element {
@@ -129897,94 +129985,6 @@ cont {
     }
   }
 }
-cont {
-  name: "tourism-resort"
-  element {
-    scale: 16
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "hotel-m"
-      priority: 2750
-      min_distance: 16
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -7250
-    }
-  }
-}
 cont {
   name: "tourism-theme_park"
   element {
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index 08d9a1c42e..281af14fe9 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -746,8 +746,8 @@ piste:type-snow_park                                # caption z15- (also has are
 === 2770
 
 amenity-townhall                                    # icon z16- (also has caption(optional) z16-)
-tourism-hotel                                       # icon z16- (also has caption(optional) z16-)
 leisure-resort                                      # icon z16- (also has caption(optional) z16-)
+tourism-hotel                                       # icon z16- (also has caption(optional) z16-)
 === 2750
 
 amenity-arts_centre                                 # icon z17- (also has caption(optional) z17-)
@@ -1669,8 +1669,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -7150
 
 # amenity-townhall                                  # caption(optional) z16- (also has icon z16-)
+# leisure-resort                                    # caption(optional) z16- (also has icon z16-)
 # tourism-hotel                                     # caption(optional) z16- (also has icon z16-)
-# tourism-resort                                    # caption(optional) z16- (also has icon z16-)
 # === -7250
 
 # amenity-arts_centre                               # caption(optional) z17- (also has icon z17-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index f755e1ac74..12dc4da5b7 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -746,8 +746,8 @@ piste:type-snow_park                                # caption z15- (also has are
 === 2770
 
 amenity-townhall                                    # icon z16- (also has caption(optional) z16-)
-tourism-hotel                                       # icon z16- (also has caption(optional) z16-)
 leisure-resort                                      # icon z16- (also has caption(optional) z16-)
+tourism-hotel                                       # icon z16- (also has caption(optional) z16-)
 === 2750
 
 amenity-arts_centre                                 # icon z17- (also has caption(optional) z17-)
@@ -1669,8 +1669,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -7150
 
 # amenity-townhall                                  # caption(optional) z16- (also has icon z16-)
+# leisure-resort                                    # caption(optional) z16- (also has icon z16-)
 # tourism-hotel                                     # caption(optional) z16- (also has icon z16-)
-# tourism-resort                                    # caption(optional) z16- (also has icon z16-)
 # === -7250
 
 # amenity-arts_centre                               # caption(optional) z17- (also has icon z17-)
diff --git a/data/types.txt b/data/types.txt
index 3db8a585ab..607ea075bb 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1108,7 +1108,7 @@ leisure|sports_centre
 leisure|sports_centre
 *amenity|public_bookcase
 *tourism|apartment
-*tourism|resort
+*leisure|resort
 *shop|interior_decoration
 *shop|houseware
 *hwtag|nobicycle
diff --git a/data/visibility.txt b/data/visibility.txt
index e09dc104a4..8e46ca90f2 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -676,6 +676,7 @@ world  000000000000000000000  +
         pitch  000000000000000000000  -
         playground  000000000000000000000  -
         recreation_ground  000000000000000000000  -
+        resort  000000000000000000000  -
         sauna  000000000000000000000  -
         slipway  000000000000000000000  -
         sports_centre  000000000000000000000  -
@@ -1395,7 +1396,6 @@ world  000000000000000000000  +
         motel  000000000000000000000  -
         museum  000000000000000111111  -
         picnic_site  000000000000000000000  -
-        resort  000000000000000000000  -
         theme_park  000000000000001111111  -
         viewpoint  000000000000001111111  -
         wilderness_hut  000000000000000000000  -