diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 45d102edf..5f6e97c73 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -451,28 +451,44 @@ node|z16[historic=castle],
 node|z17-[historic=fort],
 node|z17-[historic=castle],
 {icon-image: remains-m.svg;}
-node|z17-[historic=ruins][name],
-{icon-image: remains-m.svg;}
 
-node|z12-14[historic=castle][castle_type=castrum]
-node|z12-14[historic=castle][castle_type=defensive]
-node|z12-14[historic=castle][castle_type=fortified_church]
-node|z12-14[historic=castle][castle_type=fortress]
-node|z12-14[historic=castle][castle_type=hillfort]
-node|z12-14[historic=castle][castle_type=kremlin]
-node|z12-14[historic=castle][castle_type=shiro]
-node|z12-14[historic=fort]
+node|z12-14[historic=castle][castle_type=castrum],
+node|z12-14[historic=castle][castle_type=defensive],
+node|z12-14[historic=castle][castle_type=fortified_church],
+node|z12-14[historic=castle][castle_type=fortress],
+node|z12-14[historic=castle][castle_type=hillfort],
+node|z12-14[historic=castle][castle_type=kremlin],
+node|z12-14[historic=castle][castle_type=shiro],
+node|z12-14[historic=fort],
 {icon-image: castle-s.svg;}
-node|z15-[historic=castle][castle_type=castrum]
-node|z15-[historic=castle][castle_type=defensive]
-node|z15-[historic=castle][castle_type=fortified_church]
-node|z15-[historic=castle][castle_type=fortress]
-node|z15-[historic=castle][castle_type=hillfort]
-node|z15-[historic=castle][castle_type=kremlin]
-node|z15-[historic=castle][castle_type=shiro]
+node|z15-[historic=castle][castle_type=castrum],
+node|z15-[historic=castle][castle_type=defensive],
+node|z15-[historic=castle][castle_type=fortified_church],
+node|z15-[historic=castle][castle_type=fortress],
+node|z15-[historic=castle][castle_type=hillfort],
+node|z15-[historic=castle][castle_type=kremlin],
+node|z15-[historic=castle][castle_type=shiro],
 node|z15-[historic=fort]
 {icon-image: castle-m.svg;}
 
+node|z12-14[historic=ruins][castle_type=castrum],
+node|z12-14[historic=ruins][castle_type=defensive],
+node|z12-14[historic=ruins][castle_type=fortified_church],
+node|z12-14[historic=ruins][castle_type=fortress],
+node|z12-14[historic=ruins][castle_type=hillfort],
+node|z12-14[historic=ruins][castle_type=kremlin],
+node|z12-14[historic=ruins][castle_type=shiro],
+{icon-image: remains-s.svg;}
+node|z15-[historic=ruins][castle_type=castrum],
+node|z15-[historic=ruins][castle_type=defensive],
+node|z15-[historic=ruins][castle_type=fortified_church],
+node|z15-[historic=ruins][castle_type=fortress],
+node|z15-[historic=ruins][castle_type=hillfort],
+node|z15-[historic=ruins][castle_type=kremlin],
+node|z15-[historic=ruins][castle_type=shiro],
+node|z17-[historic=ruins][name],
+{icon-image: remains-m.svg;}
+
 node|z17-[historic=archaeological_site],
 {icon-image: archaeological-site-m.svg;}
 
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index d1768f904..fc20b69e9 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -114,6 +114,9 @@ natural-water-reservoir                             # caption z10- (also has are
 barrier-toll_booth                                  # icon z12- (also has caption(optional) z14-)
 === 6600
 
+historic-ruins                                      # icon z17- (also has caption(optional) z17-)
+=== 6551
+
 historic-castle                                     # icon z12- (also has caption(optional) z12-)
 historic-castle-castrum                             # icon z12- (also has caption(optional) z12-)
 historic-castle-defensive                           # icon z12- (also has caption(optional) z12-)
@@ -1143,7 +1146,6 @@ amenity-prison                                      # icon z17- (also has captio
 amenity-social_facility                             # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z18-, area z13-)
 highway-ladder                                      # icon z17- and pathtext z17- (also has line z15-)
-historic-ruins                                      # icon z17- (also has caption(optional) z17-)
 landuse-farmland                                    # caption z15- (also has area z10-)
 landuse-garages                                     # caption z15- (also has area z13-)
 landuse-orchard                                     # caption z15- (also has area z12-)
@@ -1368,6 +1370,9 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-toll_booth                                # caption(optional) z14- (also has icon z12-)
 # === -3400
 
+# historic-ruins                                    # caption(optional) z17- (also has icon z17-)
+# === -3449
+
 # historic-castle                                   # caption(optional) z12- (also has icon z12-)
 # historic-castle-castrum                           # caption(optional) z12- (also has icon z12-)
 # historic-castle-defensive                         # caption(optional) z12- (also has icon z12-)
@@ -2142,7 +2147,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-prison                                    # caption(optional) z17- (also has icon z17-, area z12-)
 # amenity-social_facility                           # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-waste_transfer_station                    # caption(optional) z18- (also has icon z17-, area z13-)
-# historic-ruins                                    # caption(optional) z17- (also has icon z17-)
 # leisure-ice_rink                                  # caption(optional) z17- (also has icon z17-)
 # leisure-pitch                                     # caption(optional) z17- (also has icon z17-, area z15-)
 # man_made-chimney                                  # caption(optional) z18- (also has icon z16-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 19aab7cb6..9fb5b0667 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -114,6 +114,9 @@ natural-water-reservoir                             # caption z10- (also has are
 barrier-toll_booth                                  # icon z12- (also has caption(optional) z14-)
 === 6600
 
+historic-ruins                                      # icon z17- (also has caption(optional) z17-)
+=== 6551
+
 historic-castle                                     # icon z12- (also has caption(optional) z12-)
 historic-castle-castrum                             # icon z12- (also has caption(optional) z12-)
 historic-castle-defensive                           # icon z12- (also has caption(optional) z12-)
@@ -1144,7 +1147,6 @@ amenity-prison                                      # icon z17- (also has captio
 amenity-social_facility                             # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z18-, area z13-)
 highway-ladder                                      # icon z16- and pathtext z17- (also has line z12-)
-historic-ruins                                      # icon z17- (also has caption(optional) z17-)
 landuse-farmland                                    # caption z15- (also has area z10-)
 landuse-garages                                     # caption z15- (also has area z13-)
 landuse-orchard                                     # caption z15- (also has area z12-)
@@ -1371,6 +1373,9 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-toll_booth                                # caption(optional) z14- (also has icon z12-)
 # === -3400
 
+# historic-ruins                                    # caption(optional) z17- (also has icon z17-)
+# === -3449
+
 # historic-castle                                   # caption(optional) z12- (also has icon z12-)
 # historic-castle-castrum                           # caption(optional) z12- (also has icon z12-)
 # historic-castle-defensive                         # caption(optional) z12- (also has icon z12-)
@@ -2145,7 +2150,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-prison                                    # caption(optional) z17- (also has icon z17-, area z12-)
 # amenity-social_facility                           # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-waste_transfer_station                    # caption(optional) z18- (also has icon z17-, area z13-)
-# historic-ruins                                    # caption(optional) z17- (also has icon z17-)
 # leisure-ice_rink                                  # caption(optional) z17- (also has icon z17-)
 # leisure-pitch                                     # caption(optional) z17- (also has icon z17-, area z15-)
 # man_made-chimney                                  # caption(optional) z18- (also has icon z16-)
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index bfe87f886..424a61231 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -267,6 +267,9 @@ boundary-protected_area-6                           # icon z12- (also has captio
 leisure-nature_reserve                              # icon z12- (also has caption(optional) z12-, area z10-)
 === 2500
 
+historic-ruins                                      # icon z17- (also has caption(optional) z17-)
+=== 2451
+
 historic-castle                                     # icon z12- (also has caption(optional) z15-)
 historic-castle-castrum                             # icon z12- (also has caption(optional) z15-)
 historic-castle-defensive                           # icon z12- (also has caption(optional) z15-)
@@ -717,7 +720,6 @@ historic-memorial-cross                             # icon z17- (also has captio
 
 amenity-arts_centre                                 # icon z17- (also has caption(optional) z17-)
 historic-archaeological_site                        # icon z17- (also has caption(optional) z17-)
-historic-ruins                                      # icon z17- (also has caption(optional) z17-)
 === 300
 
 amenity-fast_food                                   # icon z17- (also has caption(optional) z17-)
@@ -838,6 +840,9 @@ entrance-main                                       # icon z18- (also has captio
 # leisure-nature_reserve                            # caption(optional) z12- (also has icon z12-, area z10-)
 # === -7500
 
+# historic-ruins                                    # caption(optional) z17- (also has icon z17-)
+# === -7549
+
 # historic-castle                                   # caption(optional) z15- (also has icon z12-)
 # historic-castle-castrum                           # caption(optional) z15- (also has icon z12-)
 # historic-castle-defensive                         # caption(optional) z15- (also has icon z12-)
@@ -1207,7 +1212,6 @@ entrance-main                                       # icon z18- (also has captio
 
 # amenity-arts_centre                               # caption(optional) z17- (also has icon z17-)
 # historic-archaeological_site                      # caption(optional) z17- (also has icon z17-)
-# historic-ruins                                    # caption(optional) z17- (also has icon z17-)
 # === -9700
 
 # amenity-fast_food                                 # caption(optional) z17- (also has icon z17-)