diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 94336d3d22..529a5525b1 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 4dbd2765a9..59d6805fe2 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -3000,14 +3000,14 @@ cont {
     scale: 18
     symbol {
       name: "bench"
-      priority: 300
+      priority: 30
     }
   }
   element {
     scale: 19
     symbol {
       name: "bench"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -3016,7 +3016,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -3026,7 +3026,7 @@ cont {
     scale: 17
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3035,14 +3035,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 18
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3051,14 +3051,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 19
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3067,7 +3067,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
 }
@@ -5883,7 +5883,7 @@ cont {
     scale: 18
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -5893,14 +5893,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
   element {
     scale: 19
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -5910,7 +5910,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
 }
@@ -6033,7 +6033,7 @@ cont {
     scale: 17
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6042,14 +6042,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 18
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6058,14 +6058,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 19
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6074,7 +6074,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
 }
@@ -6297,7 +6297,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6309,7 +6309,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6321,7 +6321,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6331,7 +6331,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6342,7 +6342,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6352,7 +6352,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6373,7 +6373,7 @@ cont {
     }
     symbol {
       name: "parking_pay-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6385,7 +6385,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6397,7 +6397,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6407,7 +6407,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6418,7 +6418,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6428,7 +6428,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6438,32 +6438,36 @@ cont {
     scale: 15
     area {
       color: 15921852
+      priority: -1900
     }
   }
   element {
     scale: 16
     area {
       color: 15921852
+      priority: -1900
     }
   }
   element {
     scale: 17
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
   }
   element {
     scale: 18
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6472,17 +6476,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
   element {
     scale: 19
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6491,7 +6496,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
 }
@@ -6512,7 +6517,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6524,7 +6529,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6536,7 +6541,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6546,7 +6551,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6557,7 +6562,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6567,7 +6572,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6588,7 +6593,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 100
       min_distance: 5
     }
   }
@@ -6600,7 +6605,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
   }
@@ -6612,7 +6617,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
     caption {
@@ -6622,7 +6627,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
   element {
@@ -6633,7 +6638,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
     caption {
@@ -6643,7 +6648,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
 }
@@ -6664,7 +6669,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6676,7 +6681,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6688,7 +6693,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6698,7 +6703,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6709,7 +6714,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6719,7 +6724,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6740,7 +6745,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 250
       min_distance: 5
     }
   }
@@ -6752,7 +6757,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
   }
@@ -6764,7 +6769,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
     caption {
@@ -6774,7 +6779,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9750
     }
   }
   element {
@@ -6785,7 +6790,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
     caption {
@@ -6795,7 +6800,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9750
     }
   }
 }
@@ -6830,7 +6835,7 @@ cont {
     }
     symbol {
       name: "parking_private-m"
-      priority: 2150
+      priority: 100
     }
     caption {
       primary {
@@ -6839,7 +6844,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
   element {
@@ -6850,7 +6855,7 @@ cont {
     }
     symbol {
       name: "parking_private-m"
-      priority: 2150
+      priority: 100
     }
     caption {
       primary {
@@ -6859,7 +6864,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
 }
@@ -6869,32 +6874,36 @@ cont {
     scale: 15
     area {
       color: 15921852
+      priority: -1900
     }
   }
   element {
     scale: 16
     area {
       color: 15921852
+      priority: -1900
     }
   }
   element {
     scale: 17
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
   }
   element {
     scale: 18
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6903,17 +6912,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
   element {
     scale: 19
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6922,7 +6932,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
 }
@@ -6943,7 +6953,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 300
       min_distance: 5
     }
   }
@@ -6955,7 +6965,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
   }
@@ -6967,7 +6977,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6977,7 +6987,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9700
     }
   }
   element {
@@ -6988,7 +6998,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6998,7 +7008,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9700
     }
   }
 }
@@ -7008,28 +7018,28 @@ cont {
     scale: 16
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 17
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
     caption {
       primary {
@@ -7038,7 +7048,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9150
+      priority: -9750
     }
   }
 }
@@ -7048,28 +7058,28 @@ cont {
     scale: 16
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 17
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
     caption {
       primary {
@@ -7078,7 +7088,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9150
+      priority: -9750
     }
   }
 }
@@ -7092,6 +7102,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7102,6 +7113,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7112,6 +7124,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7122,6 +7135,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7132,6 +7146,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7141,35 +7156,35 @@ cont {
     scale: 15
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
   }
   element {
     scale: 16
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
   }
   element {
     scale: 17
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
     caption {
       primary {
@@ -7178,7 +7193,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9960
     }
   }
 }
@@ -7192,6 +7207,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7202,6 +7218,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7212,6 +7229,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7222,6 +7240,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7232,6 +7251,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7245,6 +7265,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7255,6 +7276,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7265,6 +7287,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7275,6 +7298,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7285,6 +7309,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7298,6 +7323,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7308,6 +7334,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7318,6 +7345,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7328,6 +7356,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7338,6 +7367,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -8479,7 +8509,7 @@ cont {
     scale: 18
     symbol {
       name: "postbox-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8488,14 +8518,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
   element {
     scale: 19
     symbol {
       name: "postbox-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8504,7 +8534,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
 }
@@ -8708,6 +8738,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 450
     }
   }
 }
@@ -8783,21 +8814,21 @@ cont {
     scale: 17
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
   }
   element {
     scale: 18
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
   }
   element {
     scale: 19
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8806,7 +8837,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
 }
@@ -9675,7 +9706,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9684,14 +9715,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9700,7 +9731,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9710,7 +9741,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9719,14 +9750,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9735,7 +9766,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9745,7 +9776,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9754,14 +9785,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9770,7 +9801,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9780,7 +9811,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9789,14 +9820,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9805,7 +9836,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9815,7 +9846,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9824,14 +9855,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9840,7 +9871,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9850,7 +9881,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9859,14 +9890,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9875,7 +9906,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9885,7 +9916,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9894,14 +9925,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9910,7 +9941,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9971,7 +10002,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9980,14 +10011,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9996,7 +10027,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -10108,7 +10139,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -10117,14 +10148,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -10133,7 +10164,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -10210,14 +10241,14 @@ cont {
     scale: 18
     symbol {
       name: "waste-basket-s"
-      priority: 300
+      priority: 20
     }
   }
   element {
     scale: 19
     symbol {
       name: "waste-basket-s"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -10226,7 +10257,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
 }
@@ -10236,7 +10267,7 @@ cont {
     scale: 18
     symbol {
       name: "waste-basket-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -10245,14 +10276,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
   element {
     scale: 19
     symbol {
       name: "waste-basket-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -10261,7 +10292,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -13514,7 +13545,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13530,7 +13561,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13546,7 +13577,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13562,7 +13593,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
 }
@@ -14814,7 +14845,7 @@ cont {
     scale: 18
     symbol {
       name: "defibrillator-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -14823,14 +14854,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
   element {
     scale: 19
     symbol {
       name: "defibrillator-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -14839,7 +14870,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -14849,7 +14880,7 @@ cont {
     scale: 18
     symbol {
       name: "firehydrant-m"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -14858,14 +14889,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
   element {
     scale: 19
     symbol {
       name: "firehydrant-m"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -14874,7 +14905,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
 }
@@ -14908,7 +14939,7 @@ cont {
     scale: 19
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 50
     }
     caption {
       primary {
@@ -14924,7 +14955,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9900
+      priority: -9950
     }
   }
 }
@@ -14934,7 +14965,7 @@ cont {
     scale: 18
     symbol {
       name: "exit-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -14944,14 +14975,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
   element {
     scale: 19
     symbol {
       name: "exit-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -14967,7 +14998,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
 }
@@ -14977,7 +15008,7 @@ cont {
     scale: 18
     symbol {
       name: "main_entrance-s"
-      priority: 400
+      priority: 170
     }
     caption {
       primary {
@@ -14987,14 +15018,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9600
+      priority: -9830
     }
   }
   element {
     scale: 19
     symbol {
       name: "main_entrance-s"
-      priority: 400
+      priority: 170
     }
     caption {
       primary {
@@ -15010,7 +15041,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9600
+      priority: -9830
     }
   }
 }
@@ -40709,7 +40740,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 250
+      priority: 200
     }
     apply_if: "name"
   }
@@ -40733,7 +40764,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 250
+      priority: 200
     }
     apply_if: "name"
   }
@@ -56526,7 +56557,7 @@ cont {
     scale: 19
     symbol {
       name: "power-m"
-      priority: 150
+      priority: 20
     }
     caption {
       primary {
@@ -56535,7 +56566,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9850
+      priority: -9980
     }
   }
 }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 382fd59e0c..e373e2ee36 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 df0b8fc050..68369da23a 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -3000,14 +3000,14 @@ cont {
     scale: 18
     symbol {
       name: "bench"
-      priority: 300
+      priority: 30
     }
   }
   element {
     scale: 19
     symbol {
       name: "bench"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -3016,7 +3016,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -3026,7 +3026,7 @@ cont {
     scale: 17
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3035,14 +3035,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 18
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3051,14 +3051,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 19
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3067,7 +3067,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
 }
@@ -5849,7 +5849,7 @@ cont {
     scale: 18
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -5859,14 +5859,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
   element {
     scale: 19
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -5876,7 +5876,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
 }
@@ -5999,7 +5999,7 @@ cont {
     scale: 17
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6008,14 +6008,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 18
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6024,14 +6024,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 19
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6040,7 +6040,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
 }
@@ -6263,7 +6263,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6275,7 +6275,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6287,7 +6287,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6297,7 +6297,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6308,7 +6308,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6318,7 +6318,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6339,7 +6339,7 @@ cont {
     }
     symbol {
       name: "parking_pay-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6351,7 +6351,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6363,7 +6363,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6373,7 +6373,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6384,7 +6384,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6394,7 +6394,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6404,32 +6404,36 @@ cont {
     scale: 15
     area {
       color: 15921852
+      priority: -1900
     }
   }
   element {
     scale: 16
     area {
       color: 15921852
+      priority: -1900
     }
   }
   element {
     scale: 17
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
   }
   element {
     scale: 18
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6438,17 +6442,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
   element {
     scale: 19
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6457,7 +6462,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
 }
@@ -6478,7 +6483,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6490,7 +6495,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6502,7 +6507,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6512,7 +6517,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6523,7 +6528,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6533,7 +6538,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6554,7 +6559,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 100
       min_distance: 5
     }
   }
@@ -6566,7 +6571,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
   }
@@ -6578,7 +6583,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
     caption {
@@ -6588,7 +6593,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
   element {
@@ -6599,7 +6604,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
     caption {
@@ -6609,7 +6614,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
 }
@@ -6630,7 +6635,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6642,7 +6647,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6654,7 +6659,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6664,7 +6669,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6675,7 +6680,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6685,7 +6690,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6706,7 +6711,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 250
       min_distance: 5
     }
   }
@@ -6718,7 +6723,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
   }
@@ -6730,7 +6735,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
     caption {
@@ -6740,7 +6745,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9750
     }
   }
   element {
@@ -6751,7 +6756,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
     caption {
@@ -6761,7 +6766,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9750
     }
   }
 }
@@ -6796,7 +6801,7 @@ cont {
     }
     symbol {
       name: "parking_private-m"
-      priority: 2150
+      priority: 100
     }
     caption {
       primary {
@@ -6805,7 +6810,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
   element {
@@ -6816,7 +6821,7 @@ cont {
     }
     symbol {
       name: "parking_private-m"
-      priority: 2150
+      priority: 100
     }
     caption {
       primary {
@@ -6825,7 +6830,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
 }
@@ -6835,32 +6840,36 @@ cont {
     scale: 15
     area {
       color: 15921852
+      priority: -1900
     }
   }
   element {
     scale: 16
     area {
       color: 15921852
+      priority: -1900
     }
   }
   element {
     scale: 17
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
   }
   element {
     scale: 18
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6869,17 +6878,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
   element {
     scale: 19
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6888,7 +6898,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
 }
@@ -6909,7 +6919,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 300
       min_distance: 5
     }
   }
@@ -6921,7 +6931,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
   }
@@ -6933,7 +6943,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6943,7 +6953,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9700
     }
   }
   element {
@@ -6954,7 +6964,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6964,7 +6974,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9700
     }
   }
 }
@@ -6974,21 +6984,21 @@ cont {
     scale: 17
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
     caption {
       primary {
@@ -6997,7 +7007,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9150
+      priority: -9750
     }
   }
 }
@@ -7007,21 +7017,21 @@ cont {
     scale: 17
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
     caption {
       primary {
@@ -7030,7 +7040,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9150
+      priority: -9750
     }
   }
 }
@@ -7044,6 +7054,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7053,14 +7064,14 @@ cont {
     scale: 18
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
     caption {
       primary {
@@ -7069,7 +7080,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9960
     }
   }
 }
@@ -7083,6 +7094,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7096,6 +7108,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7109,6 +7122,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -8250,7 +8264,7 @@ cont {
     scale: 18
     symbol {
       name: "postbox-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8259,14 +8273,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
   element {
     scale: 19
     symbol {
       name: "postbox-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8275,7 +8289,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
 }
@@ -8479,6 +8493,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 450
     }
   }
 }
@@ -8554,21 +8569,21 @@ cont {
     scale: 17
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
   }
   element {
     scale: 18
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
   }
   element {
     scale: 19
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8577,7 +8592,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
 }
@@ -9446,7 +9461,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9455,14 +9470,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9471,7 +9486,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9481,7 +9496,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9490,14 +9505,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9506,7 +9521,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9516,7 +9531,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9525,14 +9540,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9541,7 +9556,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9551,7 +9566,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9560,14 +9575,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9576,7 +9591,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9586,7 +9601,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9595,14 +9610,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9611,7 +9626,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9621,7 +9636,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9630,14 +9645,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9646,7 +9661,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9656,7 +9671,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9665,14 +9680,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9681,7 +9696,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9726,7 +9741,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9735,14 +9750,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9751,7 +9766,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9863,7 +9878,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9872,14 +9887,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9888,7 +9903,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9965,14 +9980,14 @@ cont {
     scale: 18
     symbol {
       name: "waste-basket-s"
-      priority: 300
+      priority: 20
     }
   }
   element {
     scale: 19
     symbol {
       name: "waste-basket-s"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -9981,7 +9996,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
 }
@@ -9991,7 +10006,7 @@ cont {
     scale: 18
     symbol {
       name: "waste-basket-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -10000,14 +10015,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
   element {
     scale: 19
     symbol {
       name: "waste-basket-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -10016,7 +10031,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -13269,7 +13284,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13285,7 +13300,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13301,7 +13316,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13317,7 +13332,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
 }
@@ -14569,7 +14584,7 @@ cont {
     scale: 18
     symbol {
       name: "defibrillator-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -14578,14 +14593,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
   element {
     scale: 19
     symbol {
       name: "defibrillator-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -14594,7 +14609,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -14604,7 +14619,7 @@ cont {
     scale: 18
     symbol {
       name: "firehydrant-m"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -14613,14 +14628,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
   element {
     scale: 19
     symbol {
       name: "firehydrant-m"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -14629,7 +14644,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
 }
@@ -14663,7 +14678,7 @@ cont {
     scale: 19
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 50
     }
     caption {
       primary {
@@ -14679,7 +14694,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9900
+      priority: -9950
     }
   }
 }
@@ -14689,7 +14704,7 @@ cont {
     scale: 18
     symbol {
       name: "exit-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -14699,14 +14714,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
   element {
     scale: 19
     symbol {
       name: "exit-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -14722,7 +14737,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
 }
@@ -14732,7 +14747,7 @@ cont {
     scale: 18
     symbol {
       name: "main_entrance-s"
-      priority: 400
+      priority: 170
     }
     caption {
       primary {
@@ -14742,14 +14757,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9600
+      priority: -9830
     }
   }
   element {
     scale: 19
     symbol {
       name: "main_entrance-s"
-      priority: 400
+      priority: 170
     }
     caption {
       primary {
@@ -14765,7 +14780,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9600
+      priority: -9830
     }
   }
 }
@@ -40298,7 +40313,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 250
+      priority: 200
     }
     apply_if: "name"
   }
@@ -40322,7 +40337,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 250
+      priority: 200
     }
     apply_if: "name"
   }
@@ -56115,7 +56130,7 @@ cont {
     scale: 19
     symbol {
       name: "power-m"
-      priority: 150
+      priority: 20
     }
     caption {
       primary {
@@ -56124,7 +56139,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9850
+      priority: -9980
     }
   }
 }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index a61e73be55..1dcca9a747 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 8e2ecdca65..ba3163cb6f 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -3000,14 +3000,14 @@ cont {
     scale: 18
     symbol {
       name: "bench"
-      priority: 300
+      priority: 30
     }
   }
   element {
     scale: 19
     symbol {
       name: "bench"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -3016,7 +3016,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -3026,7 +3026,7 @@ cont {
     scale: 17
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3035,14 +3035,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 18
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3051,14 +3051,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 19
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3067,7 +3067,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
 }
@@ -5849,7 +5849,7 @@ cont {
     scale: 18
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -5859,14 +5859,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
   element {
     scale: 19
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -5876,7 +5876,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
 }
@@ -5999,7 +5999,7 @@ cont {
     scale: 17
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6008,14 +6008,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 18
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6024,14 +6024,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 19
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6040,7 +6040,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
 }
@@ -6263,7 +6263,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6275,7 +6275,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6287,7 +6287,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6297,7 +6297,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6308,7 +6308,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6318,7 +6318,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6339,7 +6339,7 @@ cont {
     }
     symbol {
       name: "parking_pay-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6351,7 +6351,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6363,7 +6363,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6373,7 +6373,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6384,7 +6384,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6394,7 +6394,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6404,32 +6404,36 @@ cont {
     scale: 15
     area {
       color: 2038555
+      priority: -1900
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
+      priority: -1900
     }
   }
   element {
     scale: 17
     area {
       color: 2038555
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6438,17 +6442,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
   element {
     scale: 19
     area {
       color: 2038555
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6457,7 +6462,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
 }
@@ -6478,7 +6483,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6490,7 +6495,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6502,7 +6507,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6512,7 +6517,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6523,7 +6528,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6533,7 +6538,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6554,7 +6559,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 100
       min_distance: 5
     }
   }
@@ -6566,7 +6571,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
   }
@@ -6578,7 +6583,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
     caption {
@@ -6588,7 +6593,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
   element {
@@ -6599,7 +6604,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
     caption {
@@ -6609,7 +6614,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
 }
@@ -6630,7 +6635,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6642,7 +6647,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6654,7 +6659,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6664,7 +6669,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6675,7 +6680,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6685,7 +6690,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6706,7 +6711,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 250
       min_distance: 5
     }
   }
@@ -6718,7 +6723,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
   }
@@ -6730,7 +6735,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
     caption {
@@ -6740,7 +6745,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9750
     }
   }
   element {
@@ -6751,7 +6756,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
     caption {
@@ -6761,7 +6766,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9750
     }
   }
 }
@@ -6796,7 +6801,7 @@ cont {
     }
     symbol {
       name: "parking_private-m"
-      priority: 2150
+      priority: 100
     }
     caption {
       primary {
@@ -6805,7 +6810,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
   element {
@@ -6816,7 +6821,7 @@ cont {
     }
     symbol {
       name: "parking_private-m"
-      priority: 2150
+      priority: 100
     }
     caption {
       primary {
@@ -6825,7 +6830,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
 }
@@ -6835,32 +6840,36 @@ cont {
     scale: 15
     area {
       color: 2038555
+      priority: -1900
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
+      priority: -1900
     }
   }
   element {
     scale: 17
     area {
       color: 2038555
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6869,17 +6878,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
   element {
     scale: 19
     area {
       color: 2038555
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6888,7 +6898,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
 }
@@ -6909,7 +6919,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 300
       min_distance: 5
     }
   }
@@ -6921,7 +6931,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
   }
@@ -6933,7 +6943,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6943,7 +6953,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9700
     }
   }
   element {
@@ -6954,7 +6964,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6964,7 +6974,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9700
     }
   }
 }
@@ -6974,21 +6984,21 @@ cont {
     scale: 17
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
     caption {
       primary {
@@ -6997,7 +7007,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9150
+      priority: -9750
     }
   }
 }
@@ -7007,21 +7017,21 @@ cont {
     scale: 17
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
     caption {
       primary {
@@ -7030,7 +7040,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9150
+      priority: -9750
     }
   }
 }
@@ -7044,6 +7054,7 @@ cont {
         color: 5592405
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7053,14 +7064,14 @@ cont {
     scale: 18
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
     caption {
       primary {
@@ -7069,7 +7080,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9960
     }
   }
 }
@@ -7083,6 +7094,7 @@ cont {
         color: 5592405
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7096,6 +7108,7 @@ cont {
         color: 5592405
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7109,6 +7122,7 @@ cont {
         color: 5592405
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -8250,7 +8264,7 @@ cont {
     scale: 18
     symbol {
       name: "postbox-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8259,14 +8273,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
   element {
     scale: 19
     symbol {
       name: "postbox-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8275,7 +8289,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
 }
@@ -8479,6 +8493,7 @@ cont {
         color: 5592405
         offset_y: 1
       }
+      priority: 450
     }
   }
 }
@@ -8554,21 +8569,21 @@ cont {
     scale: 17
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
   }
   element {
     scale: 18
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
   }
   element {
     scale: 19
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8577,7 +8592,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
 }
@@ -9446,7 +9461,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9455,14 +9470,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9471,7 +9486,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9481,7 +9496,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9490,14 +9505,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9506,7 +9521,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9516,7 +9531,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9525,14 +9540,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9541,7 +9556,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9551,7 +9566,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9560,14 +9575,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9576,7 +9591,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9586,7 +9601,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9595,14 +9610,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9611,7 +9626,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9621,7 +9636,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9630,14 +9645,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9646,7 +9661,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9656,7 +9671,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9665,14 +9680,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9681,7 +9696,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9726,7 +9741,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9735,14 +9750,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9751,7 +9766,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9863,7 +9878,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9872,14 +9887,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9888,7 +9903,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9965,14 +9980,14 @@ cont {
     scale: 18
     symbol {
       name: "waste-basket-s"
-      priority: 300
+      priority: 20
     }
   }
   element {
     scale: 19
     symbol {
       name: "waste-basket-s"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -9981,7 +9996,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
 }
@@ -9991,7 +10006,7 @@ cont {
     scale: 18
     symbol {
       name: "waste-basket-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -10000,14 +10015,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
   element {
     scale: 19
     symbol {
       name: "waste-basket-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -10016,7 +10031,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -13269,7 +13284,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13285,7 +13300,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13301,7 +13316,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13317,7 +13332,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
 }
@@ -14569,7 +14584,7 @@ cont {
     scale: 18
     symbol {
       name: "defibrillator-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -14578,14 +14593,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
   element {
     scale: 19
     symbol {
       name: "defibrillator-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -14594,7 +14609,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -14604,7 +14619,7 @@ cont {
     scale: 18
     symbol {
       name: "firehydrant-m"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -14613,14 +14628,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
   element {
     scale: 19
     symbol {
       name: "firehydrant-m"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -14629,7 +14644,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
 }
@@ -14663,7 +14678,7 @@ cont {
     scale: 19
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 50
     }
     caption {
       primary {
@@ -14679,7 +14694,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9900
+      priority: -9950
     }
   }
 }
@@ -14689,7 +14704,7 @@ cont {
     scale: 18
     symbol {
       name: "exit-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -14699,14 +14714,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
   element {
     scale: 19
     symbol {
       name: "exit-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -14722,7 +14737,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
 }
@@ -14732,7 +14747,7 @@ cont {
     scale: 18
     symbol {
       name: "main_entrance-s"
-      priority: 400
+      priority: 170
     }
     caption {
       primary {
@@ -14742,14 +14757,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9600
+      priority: -9830
     }
   }
   element {
     scale: 19
     symbol {
       name: "main_entrance-s"
-      priority: 400
+      priority: 170
     }
     caption {
       primary {
@@ -14765,7 +14780,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9600
+      priority: -9830
     }
   }
 }
@@ -40441,7 +40456,7 @@ cont {
         color: 5592405
         offset_y: 1
       }
-      priority: 250
+      priority: 200
     }
     apply_if: "name"
   }
@@ -40465,7 +40480,7 @@ cont {
         color: 5592405
         offset_y: 1
       }
-      priority: 250
+      priority: 200
     }
     apply_if: "name"
   }
@@ -56201,7 +56216,7 @@ cont {
     scale: 19
     symbol {
       name: "power-m"
-      priority: 150
+      priority: 20
     }
     caption {
       primary {
@@ -56210,7 +56225,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9850
+      priority: -9980
     }
   }
 }
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index c60492560f..ed03579138 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index dada95410e..f97f8aaca3 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -1709,21 +1709,21 @@ cont {
     scale: 17
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 18
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 19
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2525
+      priority: 2530
     }
   }
 }
@@ -1982,22 +1982,25 @@ cont {
     scale: 15
     area {
       color: 15921870
+      priority: -1840
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
+      priority: -1840
     }
   }
   element {
     scale: 17
     area {
       color: 16579778
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 15
     }
   }
@@ -2005,10 +2008,11 @@ cont {
     scale: 18
     area {
       color: 16579778
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 10
     }
   }
@@ -2016,10 +2020,11 @@ cont {
     scale: 19
     area {
       color: 16579778
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 10
     }
   }
@@ -2506,22 +2511,25 @@ cont {
     scale: 15
     area {
       color: 15921870
+      priority: -1840
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
+      priority: -1840
     }
   }
   element {
     scale: 17
     area {
       color: 16579778
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 15
     }
   }
@@ -2529,10 +2537,11 @@ cont {
     scale: 18
     area {
       color: 16579778
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 10
     }
   }
@@ -2540,10 +2549,11 @@ cont {
     scale: 19
     area {
       color: 16579778
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 10
     }
   }
@@ -2653,28 +2663,28 @@ cont {
     scale: 16
     symbol {
       name: "parking_entrance-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 17
     symbol {
       name: "parking_entrance-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
-      priority: 2525
+      priority: 2530
     }
   }
 }
@@ -2684,24 +2694,28 @@ cont {
     scale: 16
     symbol {
       name: "parking_entrance-m"
+      priority: 2530
     }
   }
   element {
     scale: 17
     symbol {
       name: "parking_entrance-m"
+      priority: 2530
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
+      priority: 2530
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
+      priority: 2530
     }
   }
 }
@@ -6047,7 +6061,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 30
     }
   }
   element {
@@ -6063,7 +6077,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 30
     }
   }
 }
@@ -6118,7 +6132,7 @@ cont {
         color: 6381914
         text: "addr:housenumber"
       }
-      priority: 50
+      priority: 30
     }
   }
   element {
@@ -6137,7 +6151,7 @@ cont {
         color: 6381914
         text: "addr:housenumber"
       }
-      priority: 50
+      priority: 30
     }
   }
 }
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 85ebc8c67f..4a15ce066f 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index b803f4b2dd..615981f1c4 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -1709,21 +1709,21 @@ cont {
     scale: 17
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 18
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 19
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2525
+      priority: 2530
     }
   }
 }
@@ -1982,22 +1982,25 @@ cont {
     scale: 15
     area {
       color: 1643785
+      priority: -1840
     }
   }
   element {
     scale: 16
     area {
       color: 1643785
+      priority: -1840
     }
   }
   element {
     scale: 17
     area {
       color: 2038026
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 15
     }
   }
@@ -2005,10 +2008,11 @@ cont {
     scale: 18
     area {
       color: 2038026
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 10
     }
   }
@@ -2016,10 +2020,11 @@ cont {
     scale: 19
     area {
       color: 2038026
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 10
     }
   }
@@ -2506,22 +2511,25 @@ cont {
     scale: 15
     area {
       color: 1643785
+      priority: -1840
     }
   }
   element {
     scale: 16
     area {
       color: 1643785
+      priority: -1840
     }
   }
   element {
     scale: 17
     area {
       color: 2038026
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 15
     }
   }
@@ -2529,10 +2537,11 @@ cont {
     scale: 18
     area {
       color: 2038026
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 10
     }
   }
@@ -2540,10 +2549,11 @@ cont {
     scale: 19
     area {
       color: 2038026
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 10
     }
   }
@@ -2653,28 +2663,28 @@ cont {
     scale: 16
     symbol {
       name: "parking_entrance-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 17
     symbol {
       name: "parking_entrance-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
-      priority: 2525
+      priority: 2530
     }
   }
 }
@@ -2684,24 +2694,28 @@ cont {
     scale: 16
     symbol {
       name: "parking_entrance-m"
+      priority: 2530
     }
   }
   element {
     scale: 17
     symbol {
       name: "parking_entrance-m"
+      priority: 2530
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
+      priority: 2530
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
+      priority: 2530
     }
   }
 }
@@ -6047,7 +6061,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 30
     }
   }
   element {
@@ -6063,7 +6077,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 30
     }
   }
 }
@@ -6118,7 +6132,7 @@ cont {
         color: 7566195
         text: "addr:housenumber"
       }
-      priority: 50
+      priority: 30
     }
   }
   element {
@@ -6137,7 +6151,7 @@ cont {
         color: 7566195
         text: "addr:housenumber"
       }
-      priority: 50
+      priority: 30
     }
   }
 }