diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index b29312ac11..3052f73f49 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 f08aca1a1b..9eedb09488 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -36355,7 +36355,7 @@ cont {
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36376,7 +36376,7 @@ cont {
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36397,7 +36397,7 @@ cont {
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36642,7 +36642,7 @@ cont {
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36663,7 +36663,7 @@ cont {
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36684,7 +36684,7 @@ cont {
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -48110,33 +48110,6 @@ cont {
     }
   }
 }
-cont {
-  name: "railway-crossing"
-  element {
-    scale: 17
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-}
 cont {
   name: "railway-disused"
   element {
@@ -48582,6 +48555,33 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-level_crossing"
+  element {
+    scale: 17
+    symbol {
+      name: "railway-crossing"
+      apply_for_type: 1
+      priority: 16864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "railway-crossing"
+      apply_for_type: 1
+      priority: 16864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "railway-crossing"
+      apply_for_type: 1
+      priority: 16864
+    }
+  }
+}
 cont {
   name: "railway-light_rail"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 289cfba2e2..008bb8c144 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 25d89f750f..628d197038 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -36355,7 +36355,7 @@ cont {
     }
     area {
       color: 0
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36376,7 +36376,7 @@ cont {
     }
     area {
       color: 0
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36397,7 +36397,7 @@ cont {
     }
     area {
       color: 0
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36642,7 +36642,7 @@ cont {
     }
     area {
       color: 0
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36663,7 +36663,7 @@ cont {
     }
     area {
       color: 0
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -36684,7 +36684,7 @@ cont {
     }
     area {
       color: 0
-      priority: -15338
+      priority: 16000
     }
     caption {
       primary {
@@ -48110,33 +48110,6 @@ cont {
     }
   }
 }
-cont {
-  name: "railway-crossing"
-  element {
-    scale: 17
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-}
 cont {
   name: "railway-disused"
   element {
@@ -48582,6 +48555,33 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-level_crossing"
+  element {
+    scale: 17
+    symbol {
+      name: "railway-crossing"
+      apply_for_type: 1
+      priority: 16864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "railway-crossing"
+      apply_for_type: 1
+      priority: 16864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "railway-crossing"
+      apply_for_type: 1
+      priority: 16864
+    }
+  }
+}
 cont {
   name: "railway-light_rail"
   element {
diff --git a/data/styles/clear/include/labels.mapcss b/data/styles/clear/include/labels.mapcss
index 833385c3bf..b4890ab5a9 100644
--- a/data/styles/clear/include/labels.mapcss
+++ b/data/styles/clear/include/labels.mapcss
@@ -2019,6 +2019,7 @@ node|z17-[man_made=breakwater]
   text-color:@poi_label;
   fill-opacity: 1;
   z-index: 1000;
+  -x-me-area-priority:16000;
 }
 
 area|z15-[waterway=dam],
diff --git a/data/styles/clear/include/transport.mapcss b/data/styles/clear/include/transport.mapcss
index 37b898f2c3..558e154500 100644
--- a/data/styles/clear/include/transport.mapcss
+++ b/data/styles/clear/include/transport.mapcss
@@ -461,14 +461,8 @@ node|z17-[railway=halt]::int_name {
   text-halo-color: @label_halo_light;
 }
 
-/* node|z16-[railway=level_crossing]	 { icon-image: railway-crossing.svg; } */
-/* SUBWAY STATIONS - GENERIC STYLES  */
 
-/*
-node|z13[railway=station][transport=subway] {
-	icon-image: subway-xs.svg;
-}
-*/
+/* SUBWAY STATIONS - GENERIC STYLES  */
 
 
 node|z14[railway=station][transport=subway] {
@@ -1505,4 +1499,4 @@ node|z18[aerialway=mixed_lift] {
 }
 
 
-node|z17-[railway=crossing] { icon-image: railway-crossing.svg; z-index: 2600;}
+node|z17-[railway=level_crossing]{ icon-image: railway-crossing.svg; z-index: 2600;}