diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index a7f2f44a5f..118fde0edf 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 e82a7b133f..cd235226a1 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -3270,6 +3270,7 @@ cont {
       name: "car-wash-l"
       apply_for_type: 1
       priority: 16666
+      min_distance: 24
     }
     caption {
       primary {
@@ -3285,6 +3286,7 @@ cont {
     symbol {
       name: "car-wash-l"
       priority: 16666
+      min_distance: 24
     }
     caption {
       primary {
@@ -72367,7 +72369,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16588
       min_distance: 10
     }
@@ -72383,7 +72385,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "alcohol-l"
       priority: 16637
       min_distance: 10
     }
@@ -72434,7 +72436,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "bakery-m"
       priority: 16588
       min_distance: 10
     }
@@ -72450,7 +72452,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "bakery-l"
       priority: 16637
       min_distance: 10
     }
@@ -72501,7 +72503,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "beauty-m"
       priority: 16588
       min_distance: 10
     }
@@ -72517,7 +72519,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "beauty-l"
       priority: 16637
       min_distance: 10
     }
@@ -72568,7 +72570,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16588
       min_distance: 10
     }
@@ -72584,7 +72586,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "alcohol-l"
       priority: 16637
       min_distance: 10
     }
@@ -72635,7 +72637,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "shop-bicycle-m"
       priority: 16588
       min_distance: 10
     }
@@ -72651,7 +72653,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "shop-bicycle-l"
       priority: 16637
       min_distance: 10
     }
@@ -72702,7 +72704,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "bookmaker-m"
       priority: 16588
       min_distance: 10
     }
@@ -72718,7 +72720,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "bookmaker-l"
       priority: 16637
       min_distance: 10
     }
@@ -72769,7 +72771,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "book-shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -72785,7 +72787,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "book-shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -72836,7 +72838,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "butcher-m"
       priority: 16588
       min_distance: 10
     }
@@ -72852,7 +72854,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "butcher-l"
       priority: 16637
       min_distance: 10
     }
@@ -72903,7 +72905,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car_shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -72919,7 +72921,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car_shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -72970,7 +72972,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-part-m"
       priority: 16588
       min_distance: 10
     }
@@ -72986,7 +72988,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car-part-l"
       priority: 16637
       min_distance: 10
     }
@@ -73037,7 +73039,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16588
       min_distance: 10
     }
@@ -73053,7 +73055,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car-repair-l"
       priority: 16637
       min_distance: 10
     }
@@ -73104,7 +73106,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16588
       min_distance: 10
     }
@@ -73120,7 +73122,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car-repair-l"
       priority: 16637
       min_distance: 10
     }
@@ -73171,7 +73173,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "chemist-m"
       priority: 16588
       min_distance: 10
     }
@@ -73187,7 +73189,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "chemist-l"
       priority: 16637
       min_distance: 10
     }
@@ -73238,7 +73240,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "clothes-m"
       priority: 16588
       min_distance: 10
     }
@@ -73254,7 +73256,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "clothes-l"
       priority: 16637
       min_distance: 10
     }
@@ -73305,7 +73307,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "computer-m"
       priority: 16588
       min_distance: 10
     }
@@ -73321,7 +73323,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "computer-l"
       priority: 16637
       min_distance: 10
     }
@@ -73372,7 +73374,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "sweets-m"
       priority: 16588
       min_distance: 10
     }
@@ -73388,7 +73390,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "sweets-l"
       priority: 16637
       min_distance: 10
     }
@@ -73439,7 +73441,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16588
       min_distance: 10
     }
@@ -73455,7 +73457,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "grocery-l"
       priority: 16637
       min_distance: 10
     }
@@ -73506,7 +73508,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "copyshop-m"
       priority: 16588
       min_distance: 10
     }
@@ -73522,7 +73524,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "copyshop-l"
       priority: 16637
       min_distance: 10
     }
@@ -73573,7 +73575,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "beauty-m"
       priority: 16588
       min_distance: 10
     }
@@ -73589,7 +73591,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "beauty-l"
       priority: 16637
       min_distance: 10
     }
@@ -73640,7 +73642,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "department_store-m"
       priority: 16588
       min_distance: 10
     }
@@ -73656,7 +73658,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "department_store-l"
       priority: 16637
       min_distance: 10
     }
@@ -73707,7 +73709,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "doityourself-m"
       priority: 16588
       min_distance: 10
     }
@@ -73723,7 +73725,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "doityourself-l"
       priority: 16637
       min_distance: 10
     }
@@ -73774,7 +73776,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "laundry-m"
       priority: 16588
       min_distance: 10
     }
@@ -73790,7 +73792,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "laundry-l"
       priority: 16637
       min_distance: 10
     }
@@ -73841,7 +73843,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "electronics-m"
       priority: 16588
       min_distance: 10
     }
@@ -73857,7 +73859,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "electronics-l"
       priority: 16637
       min_distance: 10
     }
@@ -73908,7 +73910,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "florist-m"
       priority: 16588
       min_distance: 10
     }
@@ -73924,7 +73926,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "florist-l"
       priority: 16637
       min_distance: 10
     }
@@ -73975,7 +73977,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "furniture-m"
       priority: 16588
       min_distance: 10
     }
@@ -73991,7 +73993,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "furniture-l"
       priority: 16637
       min_distance: 10
     }
@@ -74042,7 +74044,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "garden_center-m"
       priority: 16588
       min_distance: 10
     }
@@ -74058,7 +74060,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "garden_center-l"
       priority: 16637
       min_distance: 10
     }
@@ -74109,7 +74111,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "gift-m"
       priority: 16588
       min_distance: 10
     }
@@ -74125,7 +74127,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "gift-l"
       priority: 16637
       min_distance: 10
     }
@@ -74176,7 +74178,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "greengrocer-m"
       priority: 16588
       min_distance: 10
     }
@@ -74192,7 +74194,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "greengrocer-l"
       priority: 16637
       min_distance: 10
     }
@@ -74243,7 +74245,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "hairdresser-m"
       priority: 16588
       min_distance: 10
     }
@@ -74259,7 +74261,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "hairdresser-l"
       priority: 16637
       min_distance: 10
     }
@@ -74310,7 +74312,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "doityourself-m"
       priority: 16588
       min_distance: 10
     }
@@ -74326,7 +74328,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "doityourself-l"
       priority: 16637
       min_distance: 10
     }
@@ -74377,7 +74379,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "jewelry-m"
       priority: 16588
       min_distance: 10
     }
@@ -74393,7 +74395,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "jewelry-l"
       priority: 16637
       min_distance: 10
     }
@@ -74444,7 +74446,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "kiosk-m"
       priority: 16588
       min_distance: 10
     }
@@ -74460,7 +74462,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "kiosk-l"
       priority: 16637
       min_distance: 10
     }
@@ -74511,7 +74513,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "laundry-m"
       priority: 16588
       min_distance: 10
     }
@@ -74527,7 +74529,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "laundry-l"
       priority: 16637
       min_distance: 10
     }
@@ -74677,7 +74679,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "mobile_phone-m"
       priority: 16588
       min_distance: 10
     }
@@ -74693,7 +74695,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "mobile_phone-l"
       priority: 16637
       min_distance: 10
     }
@@ -74744,7 +74746,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "optician-m"
       priority: 16588
       min_distance: 10
     }
@@ -74760,7 +74762,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "optician-l"
       priority: 16637
       min_distance: 10
     }
@@ -74811,7 +74813,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "outdoor-shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -74827,7 +74829,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "outdoor-shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -74878,7 +74880,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "petshop-m"
       priority: 16588
       min_distance: 10
     }
@@ -74894,7 +74896,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "petshop-l"
       priority: 16637
       min_distance: 10
     }
@@ -74945,7 +74947,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "photo-shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -74961,7 +74963,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "photo-shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -75012,7 +75014,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "seafood-shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -75028,7 +75030,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "seafood-shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -75079,7 +75081,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "shoes-m"
       priority: 16588
       min_distance: 10
     }
@@ -75095,7 +75097,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "shoes-l"
       priority: 16637
       min_distance: 10
     }
@@ -75146,7 +75148,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "sports-m"
       priority: 16588
       min_distance: 10
     }
@@ -75162,7 +75164,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "sports-l"
       priority: 16637
       min_distance: 10
     }
@@ -75229,7 +75231,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "grocery-l"
       priority: 16637
       min_distance: 10
     }
@@ -75280,7 +75282,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "ticket-shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -75296,7 +75298,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "ticket-shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -75347,7 +75349,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "toys-m"
       priority: 16588
       min_distance: 10
     }
@@ -75363,7 +75365,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "toys-l"
       priority: 16637
       min_distance: 10
     }
@@ -75481,7 +75483,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16588
       min_distance: 10
     }
@@ -75497,7 +75499,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car-repair-l"
       priority: 16637
       min_distance: 10
     }
@@ -75548,7 +75550,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16588
       min_distance: 10
     }
@@ -75564,7 +75566,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "alcohol-l"
       priority: 16637
       min_distance: 10
     }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index fc0ccd08c0..124edb47d6 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 e8a2297dd9..19f27a2be2 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -2950,6 +2950,7 @@ cont {
       name: "car-wash-l"
       apply_for_type: 1
       priority: 16666
+      min_distance: 24
     }
     caption {
       primary {
@@ -2965,6 +2966,7 @@ cont {
     symbol {
       name: "car-wash-l"
       priority: 16666
+      min_distance: 24
     }
     caption {
       primary {
@@ -61505,7 +61507,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16588
       min_distance: 10
     }
@@ -61521,7 +61523,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "alcohol-l"
       priority: 16637
       min_distance: 10
     }
@@ -61572,7 +61574,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "bakery-m"
       priority: 16588
       min_distance: 10
     }
@@ -61588,7 +61590,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "bakery-l"
       priority: 16637
       min_distance: 10
     }
@@ -61639,7 +61641,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "beauty-m"
       priority: 16588
       min_distance: 10
     }
@@ -61655,7 +61657,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "beauty-l"
       priority: 16637
       min_distance: 10
     }
@@ -61706,7 +61708,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16588
       min_distance: 10
     }
@@ -61722,7 +61724,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "alcohol-l"
       priority: 16637
       min_distance: 10
     }
@@ -61773,7 +61775,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "shop-bicycle-m"
       priority: 16588
       min_distance: 10
     }
@@ -61789,7 +61791,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "shop-bicycle-l"
       priority: 16637
       min_distance: 10
     }
@@ -61840,7 +61842,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "bookmaker-m"
       priority: 16588
       min_distance: 10
     }
@@ -61856,7 +61858,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "bookmaker-l"
       priority: 16637
       min_distance: 10
     }
@@ -61907,7 +61909,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "book-shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -61923,7 +61925,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "book-shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -61974,7 +61976,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "butcher-m"
       priority: 16588
       min_distance: 10
     }
@@ -61990,7 +61992,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "butcher-l"
       priority: 16637
       min_distance: 10
     }
@@ -62041,7 +62043,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car_shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -62057,7 +62059,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car_shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -62108,7 +62110,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-part-m"
       priority: 16588
       min_distance: 10
     }
@@ -62124,7 +62126,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car-part-l"
       priority: 16637
       min_distance: 10
     }
@@ -62175,7 +62177,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16588
       min_distance: 10
     }
@@ -62191,7 +62193,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car-repair-l"
       priority: 16637
       min_distance: 10
     }
@@ -62242,7 +62244,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16588
       min_distance: 10
     }
@@ -62258,7 +62260,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car-repair-l"
       priority: 16637
       min_distance: 10
     }
@@ -62309,7 +62311,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "chemist-m"
       priority: 16588
       min_distance: 10
     }
@@ -62325,7 +62327,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "chemist-l"
       priority: 16637
       min_distance: 10
     }
@@ -62376,7 +62378,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "clothes-m"
       priority: 16588
       min_distance: 10
     }
@@ -62392,7 +62394,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "clothes-l"
       priority: 16637
       min_distance: 10
     }
@@ -62443,7 +62445,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "computer-m"
       priority: 16588
       min_distance: 10
     }
@@ -62459,7 +62461,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "computer-l"
       priority: 16637
       min_distance: 10
     }
@@ -62510,7 +62512,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "sweets-m"
       priority: 16588
       min_distance: 10
     }
@@ -62526,7 +62528,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "sweets-l"
       priority: 16637
       min_distance: 10
     }
@@ -62577,7 +62579,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16588
       min_distance: 10
     }
@@ -62593,7 +62595,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "grocery-l"
       priority: 16637
       min_distance: 10
     }
@@ -62644,7 +62646,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "copyshop-m"
       priority: 16588
       min_distance: 10
     }
@@ -62660,7 +62662,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "copyshop-l"
       priority: 16637
       min_distance: 10
     }
@@ -62711,7 +62713,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "beauty-m"
       priority: 16588
       min_distance: 10
     }
@@ -62727,7 +62729,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "beauty-l"
       priority: 16637
       min_distance: 10
     }
@@ -62778,7 +62780,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "department_store-m"
       priority: 16588
       min_distance: 10
     }
@@ -62794,7 +62796,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "department_store-l"
       priority: 16637
       min_distance: 10
     }
@@ -62845,7 +62847,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "doityourself-m"
       priority: 16588
       min_distance: 10
     }
@@ -62861,7 +62863,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "doityourself-l"
       priority: 16637
       min_distance: 10
     }
@@ -62912,7 +62914,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "laundry-m"
       priority: 16588
       min_distance: 10
     }
@@ -62928,7 +62930,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "laundry-l"
       priority: 16637
       min_distance: 10
     }
@@ -62979,7 +62981,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "electronics-m"
       priority: 16588
       min_distance: 10
     }
@@ -62995,7 +62997,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "electronics-l"
       priority: 16637
       min_distance: 10
     }
@@ -63046,7 +63048,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "florist-m"
       priority: 16588
       min_distance: 10
     }
@@ -63062,7 +63064,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "florist-l"
       priority: 16637
       min_distance: 10
     }
@@ -63113,7 +63115,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "furniture-m"
       priority: 16588
       min_distance: 10
     }
@@ -63129,7 +63131,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "furniture-l"
       priority: 16637
       min_distance: 10
     }
@@ -63180,7 +63182,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "garden_center-m"
       priority: 16588
       min_distance: 10
     }
@@ -63196,7 +63198,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "garden_center-l"
       priority: 16637
       min_distance: 10
     }
@@ -63247,7 +63249,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "gift-m"
       priority: 16588
       min_distance: 10
     }
@@ -63263,7 +63265,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "gift-l"
       priority: 16637
       min_distance: 10
     }
@@ -63314,7 +63316,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "greengrocer-m"
       priority: 16588
       min_distance: 10
     }
@@ -63330,7 +63332,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "greengrocer-l"
       priority: 16637
       min_distance: 10
     }
@@ -63381,7 +63383,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "hairdresser-m"
       priority: 16588
       min_distance: 10
     }
@@ -63397,7 +63399,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "hairdresser-l"
       priority: 16637
       min_distance: 10
     }
@@ -63448,7 +63450,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "doityourself-m"
       priority: 16588
       min_distance: 10
     }
@@ -63464,7 +63466,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "doityourself-l"
       priority: 16637
       min_distance: 10
     }
@@ -63515,7 +63517,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "jewelry-m"
       priority: 16588
       min_distance: 10
     }
@@ -63531,7 +63533,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "jewelry-l"
       priority: 16637
       min_distance: 10
     }
@@ -63582,7 +63584,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "kiosk-m"
       priority: 16588
       min_distance: 10
     }
@@ -63598,7 +63600,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "kiosk-l"
       priority: 16637
       min_distance: 10
     }
@@ -63649,7 +63651,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "laundry-m"
       priority: 16588
       min_distance: 10
     }
@@ -63665,7 +63667,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "laundry-l"
       priority: 16637
       min_distance: 10
     }
@@ -63815,7 +63817,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "mobile_phone-m"
       priority: 16588
       min_distance: 10
     }
@@ -63831,7 +63833,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "mobile_phone-l"
       priority: 16637
       min_distance: 10
     }
@@ -63882,7 +63884,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "optician-m"
       priority: 16588
       min_distance: 10
     }
@@ -63898,7 +63900,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "optician-l"
       priority: 16637
       min_distance: 10
     }
@@ -63949,7 +63951,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "outdoor-shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -63965,7 +63967,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "outdoor-shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -64016,7 +64018,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "petshop-m"
       priority: 16588
       min_distance: 10
     }
@@ -64032,7 +64034,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "petshop-l"
       priority: 16637
       min_distance: 10
     }
@@ -64083,7 +64085,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "photo-shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -64099,7 +64101,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "photo-shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -64150,7 +64152,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "seafood-shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -64166,7 +64168,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "seafood-shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -64217,7 +64219,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "shoes-m"
       priority: 16588
       min_distance: 10
     }
@@ -64233,7 +64235,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "shoes-l"
       priority: 16637
       min_distance: 10
     }
@@ -64284,7 +64286,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "sports-m"
       priority: 16588
       min_distance: 10
     }
@@ -64300,7 +64302,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "sports-l"
       priority: 16637
       min_distance: 10
     }
@@ -64367,7 +64369,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "grocery-l"
       priority: 16637
       min_distance: 10
     }
@@ -64418,7 +64420,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "ticket-shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -64434,7 +64436,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "ticket-shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -64485,7 +64487,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "toys-m"
       priority: 16588
       min_distance: 10
     }
@@ -64501,7 +64503,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "toys-l"
       priority: 16637
       min_distance: 10
     }
@@ -64619,7 +64621,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16588
       min_distance: 10
     }
@@ -64635,7 +64637,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car-repair-l"
       priority: 16637
       min_distance: 10
     }
@@ -64686,7 +64688,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16588
       min_distance: 10
     }
@@ -64702,7 +64704,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "alcohol-l"
       priority: 16637
       min_distance: 10
     }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 3d0a738dc0..50b55ab640 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 c203de969d..ef61545215 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -2950,6 +2950,7 @@ cont {
       name: "car-wash-l"
       apply_for_type: 1
       priority: 16666
+      min_distance: 24
     }
     caption {
       primary {
@@ -2965,6 +2966,7 @@ cont {
     symbol {
       name: "car-wash-l"
       priority: 16666
+      min_distance: 24
     }
     caption {
       primary {
@@ -61505,7 +61507,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16588
       min_distance: 10
     }
@@ -61521,7 +61523,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "alcohol-l"
       priority: 16637
       min_distance: 10
     }
@@ -61572,7 +61574,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "bakery-m"
       priority: 16588
       min_distance: 10
     }
@@ -61588,7 +61590,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "bakery-l"
       priority: 16637
       min_distance: 10
     }
@@ -61639,7 +61641,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "beauty-m"
       priority: 16588
       min_distance: 10
     }
@@ -61655,7 +61657,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "beauty-l"
       priority: 16637
       min_distance: 10
     }
@@ -61706,7 +61708,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16588
       min_distance: 10
     }
@@ -61722,7 +61724,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "alcohol-l"
       priority: 16637
       min_distance: 10
     }
@@ -61773,7 +61775,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "shop-bicycle-m"
       priority: 16588
       min_distance: 10
     }
@@ -61789,7 +61791,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "shop-bicycle-l"
       priority: 16637
       min_distance: 10
     }
@@ -61840,7 +61842,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "bookmaker-m"
       priority: 16588
       min_distance: 10
     }
@@ -61856,7 +61858,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "bookmaker-l"
       priority: 16637
       min_distance: 10
     }
@@ -61907,7 +61909,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "book-shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -61923,7 +61925,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "book-shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -61974,7 +61976,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "butcher-m"
       priority: 16588
       min_distance: 10
     }
@@ -61990,7 +61992,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "butcher-l"
       priority: 16637
       min_distance: 10
     }
@@ -62041,7 +62043,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car_shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -62057,7 +62059,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car_shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -62108,7 +62110,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-part-m"
       priority: 16588
       min_distance: 10
     }
@@ -62124,7 +62126,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car-part-l"
       priority: 16637
       min_distance: 10
     }
@@ -62175,7 +62177,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16588
       min_distance: 10
     }
@@ -62191,7 +62193,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car-repair-l"
       priority: 16637
       min_distance: 10
     }
@@ -62242,7 +62244,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16588
       min_distance: 10
     }
@@ -62258,7 +62260,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car-repair-l"
       priority: 16637
       min_distance: 10
     }
@@ -62309,7 +62311,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "chemist-m"
       priority: 16588
       min_distance: 10
     }
@@ -62325,7 +62327,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "chemist-l"
       priority: 16637
       min_distance: 10
     }
@@ -62376,7 +62378,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "clothes-m"
       priority: 16588
       min_distance: 10
     }
@@ -62392,7 +62394,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "clothes-l"
       priority: 16637
       min_distance: 10
     }
@@ -62443,7 +62445,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "computer-m"
       priority: 16588
       min_distance: 10
     }
@@ -62459,7 +62461,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "computer-l"
       priority: 16637
       min_distance: 10
     }
@@ -62510,7 +62512,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "sweets-m"
       priority: 16588
       min_distance: 10
     }
@@ -62526,7 +62528,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "sweets-l"
       priority: 16637
       min_distance: 10
     }
@@ -62577,7 +62579,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16588
       min_distance: 10
     }
@@ -62593,7 +62595,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "grocery-l"
       priority: 16637
       min_distance: 10
     }
@@ -62644,7 +62646,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "copyshop-m"
       priority: 16588
       min_distance: 10
     }
@@ -62660,7 +62662,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "copyshop-l"
       priority: 16637
       min_distance: 10
     }
@@ -62711,7 +62713,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "beauty-m"
       priority: 16588
       min_distance: 10
     }
@@ -62727,7 +62729,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "beauty-l"
       priority: 16637
       min_distance: 10
     }
@@ -62778,7 +62780,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "department_store-m"
       priority: 16588
       min_distance: 10
     }
@@ -62794,7 +62796,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "department_store-l"
       priority: 16637
       min_distance: 10
     }
@@ -62845,7 +62847,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "doityourself-m"
       priority: 16588
       min_distance: 10
     }
@@ -62861,7 +62863,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "doityourself-l"
       priority: 16637
       min_distance: 10
     }
@@ -62912,7 +62914,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "laundry-m"
       priority: 16588
       min_distance: 10
     }
@@ -62928,7 +62930,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "laundry-l"
       priority: 16637
       min_distance: 10
     }
@@ -62979,7 +62981,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "electronics-m"
       priority: 16588
       min_distance: 10
     }
@@ -62995,7 +62997,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "electronics-l"
       priority: 16637
       min_distance: 10
     }
@@ -63046,7 +63048,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "florist-m"
       priority: 16588
       min_distance: 10
     }
@@ -63062,7 +63064,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "florist-l"
       priority: 16637
       min_distance: 10
     }
@@ -63113,7 +63115,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "furniture-m"
       priority: 16588
       min_distance: 10
     }
@@ -63129,7 +63131,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "furniture-l"
       priority: 16637
       min_distance: 10
     }
@@ -63180,7 +63182,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "garden_center-m"
       priority: 16588
       min_distance: 10
     }
@@ -63196,7 +63198,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "garden_center-l"
       priority: 16637
       min_distance: 10
     }
@@ -63247,7 +63249,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "gift-m"
       priority: 16588
       min_distance: 10
     }
@@ -63263,7 +63265,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "gift-l"
       priority: 16637
       min_distance: 10
     }
@@ -63314,7 +63316,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "greengrocer-m"
       priority: 16588
       min_distance: 10
     }
@@ -63330,7 +63332,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "greengrocer-l"
       priority: 16637
       min_distance: 10
     }
@@ -63381,7 +63383,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "hairdresser-m"
       priority: 16588
       min_distance: 10
     }
@@ -63397,7 +63399,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "hairdresser-l"
       priority: 16637
       min_distance: 10
     }
@@ -63448,7 +63450,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "doityourself-m"
       priority: 16588
       min_distance: 10
     }
@@ -63464,7 +63466,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "doityourself-l"
       priority: 16637
       min_distance: 10
     }
@@ -63515,7 +63517,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "jewelry-m"
       priority: 16588
       min_distance: 10
     }
@@ -63531,7 +63533,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "jewelry-l"
       priority: 16637
       min_distance: 10
     }
@@ -63582,7 +63584,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "kiosk-m"
       priority: 16588
       min_distance: 10
     }
@@ -63598,7 +63600,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "kiosk-l"
       priority: 16637
       min_distance: 10
     }
@@ -63649,7 +63651,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "laundry-m"
       priority: 16588
       min_distance: 10
     }
@@ -63665,7 +63667,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "laundry-l"
       priority: 16637
       min_distance: 10
     }
@@ -63815,7 +63817,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "mobile_phone-m"
       priority: 16588
       min_distance: 10
     }
@@ -63831,7 +63833,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "mobile_phone-l"
       priority: 16637
       min_distance: 10
     }
@@ -63882,7 +63884,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "optician-m"
       priority: 16588
       min_distance: 10
     }
@@ -63898,7 +63900,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "optician-l"
       priority: 16637
       min_distance: 10
     }
@@ -63949,7 +63951,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "outdoor-shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -63965,7 +63967,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "outdoor-shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -64016,7 +64018,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "petshop-m"
       priority: 16588
       min_distance: 10
     }
@@ -64032,7 +64034,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "petshop-l"
       priority: 16637
       min_distance: 10
     }
@@ -64083,7 +64085,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "photo-shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -64099,7 +64101,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "photo-shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -64150,7 +64152,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "seafood-shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -64166,7 +64168,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "seafood-shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -64217,7 +64219,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "shoes-m"
       priority: 16588
       min_distance: 10
     }
@@ -64233,7 +64235,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "shoes-l"
       priority: 16637
       min_distance: 10
     }
@@ -64284,7 +64286,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "sports-m"
       priority: 16588
       min_distance: 10
     }
@@ -64300,7 +64302,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "sports-l"
       priority: 16637
       min_distance: 10
     }
@@ -64367,7 +64369,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "grocery-l"
       priority: 16637
       min_distance: 10
     }
@@ -64418,7 +64420,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "ticket-shop-m"
       priority: 16588
       min_distance: 10
     }
@@ -64434,7 +64436,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "ticket-shop-l"
       priority: 16637
       min_distance: 10
     }
@@ -64485,7 +64487,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "toys-m"
       priority: 16588
       min_distance: 10
     }
@@ -64501,7 +64503,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "toys-l"
       priority: 16637
       min_distance: 10
     }
@@ -64619,7 +64621,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16588
       min_distance: 10
     }
@@ -64635,7 +64637,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car-repair-l"
       priority: 16637
       min_distance: 10
     }
@@ -64686,7 +64688,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16588
       min_distance: 10
     }
@@ -64702,7 +64704,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "alcohol-l"
       priority: 16637
       min_distance: 10
     }